@bhsd/codemirror-mediawiki 2.1.1 → 2.1.3

package/dist/mediawiki.d.ts

@@ -16,6 +16,11 @@ export interface MwConfig {
 }
 /**
  * Gets a LanguageSupport instance for the MediaWiki mode.
+ * @param config Configuration for the MediaWiki mode
  */
 export declare const mediawiki: (config: MwConfig) => LanguageSupport;
+/**
+ * Gets a LanguageSupport instance for the mixed MediaWiki-HTML mode.
+ * @param config Configuration for the MediaWiki mode
+ */
 export declare const html: (config: MwConfig) => LanguageSupport;

package/dist/plugins.d.ts

@@ -1,3 +1,3 @@
 export { css } from '@codemirror/legacy-modes/mode/css';
-export { javascript } from '@codemirror/legacy-modes/mode/javascript';
+export { javascript, json } from '@codemirror/legacy-modes/mode/javascript';
 export { lua } from '@codemirror/legacy-modes/mode/lua';

package/mw/dist/base.js

@@ -1,7 +1,7 @@
-import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.1/dist/main.min.js';
+import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.3/dist/main.min.js';
 (() => {
     var _a;
-    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.1/mediawiki.min.css', 'text/css');
+    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.3/mediawiki.min.css', 'text/css');
     const instances = new WeakMap();
     $.valHooks['textarea'] = {
         get(elem) {
@@ -139,31 +139,24 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
     class CodeMirror extends CodeMirror6 {
         constructor(textarea, lang, config) {
             super(textarea, lang, config);
-            this.visible = true;
             instances.set(textarea, this);
             if (mw.loader.getState('jquery.textSelection') === 'ready') {
                 $(textarea).data('jquery.textSelection', textSelection);
             }
+            mw.hook('wiki-codemirror6').fire(this);
         }
         toggle(show = !this.visible) {
-            if (show && !this.visible) {
-                this.view.dispatch({
-                    changes: { from: 0, to: this.view.state.doc.length, insert: this.textarea.value },
-                });
-            }
-            this.visible = show;
-            this.view.dom.style.setProperty('display', show ? '' : 'none', 'important');
-            this.textarea.style.display = show ? 'none' : '';
+            super.toggle(show);
             $(this.textarea).data('jquery.textSelection', show && textSelection);
         }
-        async defaultLint(on) {
+        async defaultLint(on, opt) {
             if (!on) {
                 this.lint();
                 return;
             }
             const { lang } = this;
             if (!(lang in linters)) {
-                linters[lang] = await this.getLinter();
+                linters[lang] = await this.getLinter(opt);
                 if (this.lang === 'mediawiki' || this.lang === 'html') {
                     const mwConfig = await getMwConfig(), config = {
                         ...await wikiparse.getConfig(),
@@ -185,7 +178,9 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
                     wikiparse.setConfig(config);
                 }
             }
-            this.lint(linters[lang]);
+            if (linters[lang]) {
+                this.lint(linters[lang]);
+            }
         }
         static async fromTextArea(textarea, lang) {
             const isWiki = lang === 'mediawiki' || lang === 'html', cm = new CodeMirror(textarea, isWiki ? undefined : lang);
@@ -197,7 +192,7 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
         }
     }
     document.body.addEventListener('click', e => {
-        if (e.target instanceof HTMLTextAreaElement && (e.ctrlKey || e.metaKey) && !instances.has(e.target)) {
+        if (e.target instanceof HTMLTextAreaElement && e.shiftKey && !instances.has(e.target)) {
             e.preventDefault();
             (async () => {
                 var _a;
@@ -214,9 +209,11 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
                             lang = 'css';
                             break;
                         case 'javascript':
-                        case 'json':
                             lang = 'javascript';
                             break;
+                        case 'json':
+                            lang = 'json';
+                            break;
                         case 'Scribunto':
                             lang = 'lua';
                             break;
@@ -226,7 +223,17 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
                     }
                 }
                 const cm = await CodeMirror.fromTextArea(e.target, lang);
-                void cm.defaultLint(true);
+                let opt;
+                if (lang === 'mediawiki' && wgNamespaceNumber === 10) {
+                    opt = { include: true };
+                }
+                else if (lang === 'javascript' && (wgNamespaceNumber === 8 || wgNamespaceNumber === 2300)) {
+                    opt = {
+                        env: { browser: true, es6: true },
+                        parserOptions: { ecmaVersion: 6 },
+                    };
+                }
+                await cm.defaultLint(true, opt);
             })();
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.1.1",
+	"version": "2.1.3",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",