@bhsd/codemirror-mediawiki 2.1.8 → 2.1.9

package/mw/dist/base.js

@@ -1,7 +1,8 @@
-import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.8/dist/main.min.js';
+import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.9/dist/main.min.js';
 (() => {
     var _a;
-    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.8/mediawiki.min.css', 'text/css');
+    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.9/mediawiki.min.css', 'text/css');
+    mw.loader.addStyleTag('.wikiEditor-ui-toolbar{z-index:7}');
     const instances = new WeakMap();
     const getInstance = ($ele) => instances.get($ele[0]);
     $.valHooks['textarea'] = {
@@ -157,12 +158,27 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
             linters[this.lang] = linter;
             return linter;
         }
-        async defaultLint(on, opt) {
+        async defaultLint(on, optOrNs) {
             if (!on) {
                 this.lint();
                 return;
             }
             const { lang } = this;
+            let opt;
+            if (typeof optOrNs === 'number') {
+                if (lang === 'mediawiki' && (optOrNs === 10 || optOrNs === 828)) {
+                    opt = { include: true };
+                }
+                else if (lang === 'javascript' && (optOrNs === 8 || optOrNs === 2300)) {
+                    opt = {
+                        env: { browser: true, es6: true },
+                        parserOptions: { ecmaVersion: 6 },
+                    };
+                }
+            }
+            else {
+                opt = optOrNs;
+            }
             if (!(lang in linters)) {
                 await this.getLinter(opt);
                 if (lang === 'mediawiki') {
@@ -241,17 +257,7 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
                     }
                 }
                 const cm = await CodeMirror.fromTextArea(e.target, lang);
-                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);
+                void cm.defaultLint(true, wgNamespaceNumber);
             })();
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.1.8",
+	"version": "2.1.9",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -35,8 +35,7 @@
 		"lint:ts": "tsc --noEmit && tsc --project mw/tsconfig.json --noEmit && eslint --cache .",
 		"lint:css": "stylelint *.css",
 		"lint": "npm run lint:ts && npm run lint:css",
-		"server": "http-server .. -c-1 --cors &",
-		"test": "npm run server; open http://127.0.0.1:8080/codemirror-mediawiki/index.html",
+		"test": "http-server .. -c-1 --cors &",
 		"test:end": "pkill -x http-server"
 	},
 	"engines": {

package/src/codemirror.ts

@@ -19,7 +19,7 @@ import {
 } from '@codemirror/language';
 import {defaultKeymap, historyKeymap, history} from '@codemirror/commands';
 import {searchKeymap} from '@codemirror/search';
-import {linter, lintGutter, openLintPanel, closeLintPanel} from '@codemirror/lint';
+import {linter, lintGutter, openLintPanel, closeLintPanel, lintKeymap} from '@codemirror/lint';
 import {closeBrackets} from '@codemirror/autocomplete';
 import {mediawiki, html} from './mediawiki';
 import * as plugins from './plugins';
@@ -32,6 +32,8 @@ import type {Linter} from 'eslint';
 export type {MwConfig} from './mediawiki';
 export type LintSource = (doc: Text) => Diagnostic[] | Promise<Diagnostic[]>;
 
+declare type LintExtension = [unknown, ViewPlugin<{set: boolean, force(): void}>];
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const languages: Record<string, (config?: any) => LanguageSupport | []> = {
 	plain: () => [],
@@ -43,7 +45,7 @@ for (const [language, parser] of Object.entries(plugins)) {
 }
 const linters: Record<string, Extension> = {};
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const avail: Record<string, [ (config?: any) => Extension, Record<string, unknown> ]> = {
+const avail: Record<string, [(config?: any) => Extension, Record<string, unknown>]> = {
 	highlightSpecialChars: [highlightSpecialChars, {}],
 	highlightActiveLine: [highlightActiveLine, {}],
 	highlightWhitespace: [highlightWhitespace, {}],
@@ -137,6 +139,7 @@ export class CodeMirror6 {
 				...defaultKeymap,
 				...historyKeymap,
 				...searchKeymap,
+				...lintKeymap,
 			]),
 			EditorView.updateListener.of(({state: {doc}, docChanged}) => {
 				if (docChanged) {
@@ -186,6 +189,21 @@ export class CodeMirror6 {
 		this.#view.dom.style.minHeight = linting ? 'calc(100px + 2em)' : '2em';
 	}
 
+	/**
+	 * 开关语法检查面板
+	 * @param show 是否显示
+	 */
+	#toggleLintPanel(show: boolean): void {
+		(show ? openLintPanel : closeLintPanel)(this.#view);
+		document.querySelector<HTMLUListElement>('.cm-panel-lint ul')?.blur();
+		this.#minHeight(show);
+	}
+
+	/** 获取语法检查扩展 */
+	#getLintExtension(): LintExtension | undefined {
+		return (this.#linter.get(this.#view.state) as LintExtension[])[0];
+	}
+
 	/**
 	 * 设置语言
 	 * @param lang 语言
@@ -199,7 +217,7 @@ export class CodeMirror6 {
 			],
 		});
 		this.#lang = lang;
-		(linters[lang] ? openLintPanel : closeLintPanel)(this.#view);
+		this.#toggleLintPanel(Boolean(linters[lang]));
 	}
 
 	/**
@@ -215,25 +233,20 @@ export class CodeMirror6 {
 			: [];
 		if (lintSource) {
 			linters[this.#lang] = linterExtension;
-			this.#minHeight(true);
 		} else {
 			delete linters[this.#lang];
-			this.#minHeight();
 		}
 		this.#view.dispatch({
 			effects: [this.#linter.reconfigure(linterExtension)],
 		});
-		(lintSource ? openLintPanel : closeLintPanel)(this.#view);
+		this.#toggleLintPanel(Boolean(lintSource));
 	}
 
 	/** 立即更新语法检查 */
 	update(): void {
-		const extension = this.#linter.get(this.#view.state) as [[ unknown, ViewPlugin<{
-			set: boolean;
-			force(): void;
-		}> ]] | [];
-		if (extension.length > 0) {
-			const plugin = this.#view.plugin(extension[0]![1])!;
+		const extension = this.#getLintExtension();
+		if (extension) {
+			const plugin = this.#view.plugin(extension[1])!;
 			plugin.set = true;
 			plugin.force();
 		}
@@ -281,10 +294,10 @@ export class CodeMirror6 {
 					conf: Linter.Config = {
 						env: {
 							browser: true,
-							es2018: true,
+							es2024: true,
 						},
 						parserOptions: {
-							ecmaVersion: 9,
+							ecmaVersion: 15,
 							sourceType: 'module',
 						},
 						rules: {},

package/src/mediawiki.ts

@@ -556,7 +556,7 @@ class MediaWiki {
 
 	inHtmlTagAttribute(name: string): Tokenizer {
 		return (stream, state) => {
-			if (stream.match(/^[^>/<{]+/u)) {
+			if (stream.match(/^(?:"[^<">]*"|'[^<'>]*'[^>/<{])+/u)) {
 				return this.makeLocalStyle(modeConfig.tags.htmlTagAttribute, state);
 			} else if (stream.match(/^\/?>/u)) {
 				if (!this.implicitlyClosedHtmlTags.has(name)) {
@@ -582,7 +582,7 @@ class MediaWiki {
 
 	inExtTagAttribute(name: string): Tokenizer {
 		return (stream, state) => {
-			if (stream.match(/^[^>/]+/u)) {
+			if (stream.match(/^(?:"[^">]*"|'[^'>]*'|[^>/])+/u)) {
 				return this.makeLocalStyle(modeConfig.tags.extTagAttribute, state);
 			} else if (stream.eat('>')) {
 				state.extName = name;