@bhsd/codemirror-mediawiki 2.1.10 → 2.1.11

package/mw/dist/base.js

@@ -1,7 +1,7 @@
-import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.10/dist/main.min.js';
+import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.11/dist/main.min.js';
 (() => {
     var _a;
-    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.10/mediawiki.min.css', 'text/css');
+    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.11/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]);
@@ -55,7 +55,7 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
             return this;
         },
     };
-    const USING_LOCAL = mw.loader.getState('ext.CodeMirror') !== null, DATA_MODULE = mw.loader.getState('ext.CodeMirror.data') ? 'ext.CodeMirror.data' : 'ext.CodeMirror', ALL_SETTINGS_CACHE = (_a = JSON.parse(localStorage.getItem('InPageEditMwConfig'))) !== null && _a !== void 0 ? _a : {}, SITE_ID = `${mw.config.get('wgServerName')}${mw.config.get('wgScriptPath')}`, SITE_SETTINGS = ALL_SETTINGS_CACHE[SITE_ID], VALID = (SITE_SETTINGS === null || SITE_SETTINGS === void 0 ? void 0 : SITE_SETTINGS.time) > Date.now() - 86400 * 1000 * 30;
+    const USING_LOCAL = mw.loader.getState('ext.CodeMirror') !== null, DATA_MODULE = mw.loader.getState('ext.CodeMirror.data') ? 'ext.CodeMirror.data' : 'ext.CodeMirror', ALL_SETTINGS_CACHE = (_a = JSON.parse(localStorage.getItem('InPageEditMwConfig'))) !== null && _a !== void 0 ? _a : {}, SITE_ID = `${mw.config.get('wgServerName')}${mw.config.get('wgScriptPath')}`, SITE_SETTINGS = ALL_SETTINGS_CACHE[SITE_ID], VALID = Number(SITE_SETTINGS === null || SITE_SETTINGS === void 0 ? void 0 : SITE_SETTINGS.time) > Date.now() - 86400 * 1000 * 30;
     const getConfig = (magicWords, rule, flip) => {
         const words = magicWords.filter(rule).filter(({ 'case-sensitive': i }) => i !== flip)
             .flatMap(({ aliases, name, 'case-sensitive': i }) => aliases.map(alias => ({
@@ -166,7 +166,7 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
             const { lang } = this;
             let opt;
             if (typeof optOrNs === 'number') {
-                if (lang === 'mediawiki' && (optOrNs === 10 || optOrNs === 828)) {
+                if (lang === 'mediawiki' && (optOrNs === 10 || optOrNs === 828 || optOrNs === 2)) {
                     opt = { include: true };
                 }
                 else if (lang === 'javascript' && (optOrNs === 8 || optOrNs === 2300)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -35,7 +35,8 @@
 		"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",
-		"test": "npm run build:core && npm run build:gh-page && http-server .. -c-1 --cors &",
+		"server": "http-server .. -c-1 --cors &",
+		"test": "npm run build:core && npm run build:gh-page && npm run server",
 		"test:end": "pkill -x http-server"
 	},
 	"engines": {

package/src/codemirror.ts

@@ -7,6 +7,7 @@ import {
 	highlightActiveLine,
 	highlightWhitespace,
 	highlightTrailingWhitespace,
+	drawSelection,
 } from '@codemirror/view';
 import {
 	syntaxHighlighting,
@@ -52,6 +53,13 @@ const avail: Record<string, [(config?: any) => Extension, Record<string, unknown
 	highlightTrailingWhitespace: [highlightTrailingWhitespace, {}],
 	bracketMatching: [bracketMatching, {mediawiki: {brackets: '[]{}'}}],
 	closeBrackets: [closeBrackets, {}],
+	allowMultipleSelections: [
+		(): Extension => [
+			EditorState.allowMultipleSelections.of(true),
+			drawSelection(),
+		],
+		{},
+	],
 };
 
 /**
@@ -260,8 +268,12 @@ export class CodeMirror6 {
 		this.#view.dispatch({
 			effects: [
 				this.#extensions.reconfigure(names.map(name => {
-					const [extension, configs] = avail[name]!;
-					return extension(configs[this.#lang]);
+					const option = avail[name];
+					if (option) {
+						const [extension, configs] = option;
+						return extension(configs[this.#lang]);
+					}
+					return [];
 				})),
 			],
 		});

package/src/mediawiki.ts

@@ -151,7 +151,8 @@ class MediaWiki {
 		}));
 	}
 
-	eatHtmlEntity(stream: StringStream, style: string): string { // eslint-disable-line class-methods-use-this
+	// eslint-disable-next-line @typescript-eslint/class-methods-use-this
+	eatHtmlEntity(stream: StringStream, style: string): string {
 		const entity = stream.match(/^(?:#x[a-f\d]+|#\d+|[a-z\d]+);/iu) as RegExpMatchArray | false;
 		return entity && isHtmlEntity(`&${entity[0]}`) ? modeConfig.tags.htmlEntity : style;
 	}
@@ -164,7 +165,7 @@ class MediaWiki {
 		);
 	}
 
-	// eslint-disable-next-line class-methods-use-this
+	// eslint-disable-next-line @typescript-eslint/class-methods-use-this
 	makeLocalStyle(style: string, state: State, endGround?: 'nTemplate' | 'nLink' | 'nExt'): string {
 		let ground = '';
 
@@ -619,8 +620,7 @@ class MediaWiki {
 	eatExtTagArea(name: string): Tokenizer {
 		return (stream, state) => {
 			const from = stream.pos,
-				pattern = new RegExp(`</${name}\\s*(?:>|$)`, 'iu'),
-				m = pattern.exec(from ? stream.string.slice(from) : stream.string);
+				m = new RegExp(`</${name}\\s*(?:>|$)`, 'iu').exec(from ? stream.string.slice(from) : stream.string);
 			let origString: string | false = false;
 
 			if (m) {
@@ -633,9 +633,8 @@ class MediaWiki {
 					}
 					return state.tokenize(stream, state);
 				}
-				const to = m.index + from;
 				origString = stream.string;
-				stream.string = origString.slice(0, to);
+				stream.string = origString.slice(0, m.index + from);
 			}
 
 			state.stack.push(state.tokenize);
@@ -653,7 +652,8 @@ class MediaWiki {
 		};
 	}
 
-	inExtTokens(origString: string | false): Tokenizer { // eslint-disable-line class-methods-use-this
+	// eslint-disable-next-line @typescript-eslint/class-methods-use-this
+	inExtTokens(origString: string | false): Tokenizer {
 		return (stream, state) => {
 			let ret: string;
 			if (state.extMode === false) {
@@ -779,10 +779,11 @@ class MediaWiki {
 
 	eatWikiText(style: string): Tokenizer {
 		return (stream, state) => {
-			let ch: string | void; // eslint-disable-line @typescript-eslint/no-invalid-void-type
-			const sol = stream.sol();
+			let ch: string;
 
-			if (sol) {
+			if (stream.eol()) {
+				return '';
+			} else if (stream.sol()) {
 				if (stream.match('//')) {
 					return this.makeStyle(style, state);
 				// highlight free external links, see T108448
@@ -791,7 +792,7 @@ class MediaWiki {
 					state.tokenize = this.inFreeExternalLink.bind(this);
 					return this.makeStyle(modeConfig.tags.freeExtLinkProtocol, state);
 				}
-				ch = stream.next();
+				ch = stream.next()!;
 				switch (ch) {
 					case '-':
 						if (stream.match(/^-{3,}/u)) {
@@ -863,7 +864,7 @@ class MediaWiki {
 						// pass
 				}
 			} else {
-				ch = stream.next();
+				ch = stream.next()!;
 			}
 
 			switch (ch) {
@@ -1101,12 +1102,7 @@ class MediaWiki {
 			},
 
 			token: (stream, state): string => {
-				let style: string,
-					p: number | null = null,
-					t: Token,
-					f: number | null,
-					tmpTokens: Token[] = [];
-				const readyTokens: Token[] = [];
+				let t: Token;
 
 				if (this.oldTokens.length > 0) {
 					// just send saved tokens till they exists
@@ -1122,6 +1118,11 @@ class MediaWiki {
 					this.firstSpace = null;
 				}
 
+				let style: string,
+					p: number | null = null,
+					f: number | null;
+				const tmpTokens: Token[] = [],
+					readyTokens: Token[] = [];
 				do {
 					// get token style
 					style = state.tokenize(stream, state);
@@ -1135,7 +1136,7 @@ class MediaWiki {
 							if (tmpTokens.length > 0) {
 								// save tokens
 								readyTokens.push(...tmpTokens);
-								tmpTokens = [];
+								tmpTokens.length = 0;
 							}
 						}
 						// save token
@@ -1217,10 +1218,9 @@ for (const [language, parser] of Object.entries(plugins)) {
  * @param config Configuration for the MediaWiki mode
  */
 export const mediawiki = (config: MwConfig): LanguageSupport => {
-	const mode = new MediaWiki(config);
-	const parser = mode.mediawiki;
-	const lang = StreamLanguage.define(parser);
-	const highlighter = syntaxHighlighting(HighlightStyle.define(mode.getTagStyles()) as Highlighter);
+	const mode = new MediaWiki(config),
+		lang = StreamLanguage.define(mode.mediawiki),
+		highlighter = syntaxHighlighting(HighlightStyle.define(mode.getTagStyles()) as Highlighter);
 	return new LanguageSupport(lang, highlighter);
 };