wikiplus-highlight 2.7.5 → 2.8.1

package/matchtags.js

@@ -10,12 +10,16 @@
 	const {Pos, cmpPos} = CodeMirror;
 
 	const tagStart = /<(\/?)([A-Z_a-z]\w*)/g,
-		voidTags = ['br', 'wbr', 'hr', 'img'];
+		voidTags = ['br', 'wbr', 'hr', 'img'],
+		maxScanLines = 1000;
 
 	class Iter {
+		/**
+		 * @param {CodeMirror.Editor} cm
+		 * @param {CodeMirror.Position} pos
+		 */
 		constructor(cm, pos) {
-			const {line, ch} = pos,
-				{state: {matchTags: {maxScanLines = 1000}}} = cm;
+			const {line, ch} = pos;
 			this.line = line;
 			this.ch = ch;
 			this.cm = cm;
@@ -29,6 +33,7 @@
 			return /\b(?:mw-(?:html|ext)tag|tag\b)/.test(type);
 		}
 
+		/** @param {number} ch */
 		bracketAt(ch) {
 			const type = this.cm.getTokenTypeAt(Pos(this.line, ch + 1));
 			return /\b(?:mw-(?:html|ext)tag-)?bracket\b/.test(type);
@@ -61,14 +66,11 @@
 				if (gt === -1) {
 					return;
 				}
+				this.ch = gt + 1;
 				if (!this.bracketAt(gt)) {
-					this.ch = gt + 1;
 					continue;
 				}
-				const lastSlash = this.text.lastIndexOf('/', gt);
-				const selfClose = lastSlash > -1 && !/\S/.test(this.text.slice(lastSlash + 1, gt));
-				this.ch = gt + 1;
-				return selfClose ? 'selfClose' : 'regular';
+				return this.text[gt - 1] === '/' ? 'selfClose' : 'regular';
 			}
 		}
 
@@ -135,8 +137,9 @@
 			}
 		}
 
+		/** @param {string} tag */
 		findMatchingClose(tag) {
-			const stack = [];
+			const /** @type {string[]} */ stack = [];
 			for (;;) {
 				const next = this.toNextTag();
 				if (!next) {
@@ -172,8 +175,9 @@
 			}
 		}
 
+		/** @param {string} tag */
 		findMatchingOpen(tag) {
-			const stack = [];
+			const /** @type {string[]} */ stack = [];
 			for (;;) {
 				const prev = this.toPrevTag();
 				if (!prev) {
@@ -210,7 +214,7 @@
 		}
 	}
 
-	CodeMirror.defineExtension('findMatchingTag', function(pos) {
+	CodeMirror.defineExtension('findMatchingTag', /** @param {CodeMirror.Position} pos */ function(pos) {
 		let iter = new Iter(this, pos);
 		if (!iter.isTag()) {
 			return;
@@ -234,20 +238,32 @@
 		return {open: here, close: iter.findMatchingClose(tag), at: 'open'};
 	});
 
-	CodeMirror.defineExtension('findEnclosingTag', function(pos, tag) {
-		const iter = new Iter(this, pos);
-		const open = iter.findMatchingOpen(tag);
-		if (!open) {
-			return;
-		}
-		const forward = new Iter(this, pos);
-		const close = forward.findMatchingClose(open.tag);
-		if (close) {
-			return {open, close};
-		}
-	});
+	CodeMirror.defineExtension(
+		'findEnclosingTag',
+		/**
+		 * @param {CodeMirror.Position} pos
+		 * @param {string} tag
+		 */
+		function(pos, tag) {
+			const iter = new Iter(this, pos);
+			const open = iter.findMatchingOpen(tag);
+			if (!open) {
+				return;
+			}
+			const forward = new Iter(this, pos);
+			const close = forward.findMatchingClose(open.tag);
+			if (close) {
+				return {open, close};
+			}
+		},
+	);
 
-	// Used by addon/edit/closetag.js
+	/**
+	 * Used by addon/edit/closetag.js
+	 * @param {CodeMirror.Editor} cm
+	 * @param {CodeMirror.Position} pos
+	 * @param {string} name
+	 */
 	CodeMirror.scanForClosingTag = function(cm, pos, name) {
 		const iter = new Iter(cm, pos);
 		return iter.findMatchingClose(name);
@@ -259,12 +275,12 @@
 			clear(cm);
 		}
 		if (val) {
-			cm.state.matchTags = typeof val === 'object' ? val : {};
 			cm.on('cursorActivity', doMatchTags);
 			doMatchTags(cm);
 		}
 	});
 
+	/** @param {CodeMirror.Editor} cm */
 	function clear(cm) {
 		if (cm.state.tagHit) {
 			cm.state.tagHit.clear();
@@ -276,13 +292,22 @@
 		cm.state.tagOther = null;
 	}
 
+	/** @param {CodeMirror.Editor} cm */
 	function doMatchTags(cm) {
 		cm.operation(() => {
 			clear(cm);
 			if (cm.somethingSelected()) {
 				return;
 			}
-			const match = cm.findMatchingTag(cm.getCursor());
+
+			/**
+			 * @typedef {object} matchingTag
+			 * @property {string} at
+			 * @property {CodeMirror.MarkerRange} open
+			 * @property {CodeMirror.MarkerRange} close
+			 */
+
+			const /** @type {matchingTag}} */ match = cm.findMatchingTag(cm.getCursor());
 			if (!match) {
 				return;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikiplus-highlight",
-  "version": "2.7.5",
+  "version": "2.8.1",
   "description": "A plugin for the MediaWiki front-end add-on \"Wikiplus\"",
   "main": "main.js",
   "scripts": {
@@ -12,7 +12,7 @@
   },
   "keywords": [
     "mediawiki",
-    "mediawiki-gadget",
+    "codemirror",
     "wikiplus"
   ],
   "author": "Bhsd",
@@ -20,5 +20,9 @@
   "bugs": {
     "url": "https://github.com/bhsd-harry/Wikiplus-highlight/issues"
   },
-  "homepage": "https://github.com/bhsd-harry/Wikiplus-highlight#readme"
+  "homepage": "https://github.com/bhsd-harry/Wikiplus-highlight#readme",
+  "devDependencies": {
+    "eslint": "^8.8.0",
+    "uglify-js": "^3.15.5"
+  }
 }

package/search.js

@@ -1,11 +1,15 @@
 /**
  * @author Bhsd <https://github.com/bhsd-harry>
- * @license: GPL-3.0
+ * @license GPL-3.0
  */
 
 (() => {
 	'use strict';
 
+	/**
+	 * @param {string} key
+	 * @returns {string}
+	 */
 	const msg = key => mw.msg(`wphl-${key}`);
 
 	// Prepare elements
@@ -42,18 +46,19 @@
 			text: msg('addon-search'),
 		});
 
-	const escapeRegExp = mw.util.escapeRegExp || mw.RegExp.escape; // @type {(function|undefined)}
-	const overlay = {token: () => {}};
+	const /** @type {(str: string) => string} */ escapeRegExp = mw.util.escapeRegExp || mw.RegExp.escape;
+	const /** @type {{token: (stream: CodeMirror.StringStream) => string}} */ overlay = {token: () => {}};
 
 	/**
 	 * 根据搜索字符串生成高亮
+	 * @param {string|RegExp} str
 	 */
 	const token = str => {
-		let initial;
+		let /** @type {RegExp} */ initial;
 		if (typeof str === 'string') {
 			initial = RegExp(`[^${escapeRegExp(str[0])}]`, 'i');
 		}
-		return stream => {
+		return /** @param {CodeMirror.StringStream} stream */ stream => {
 			if (stream.match(str, true, true)) {
 				return 'search';
 			}
@@ -69,10 +74,23 @@
 		$search.css('background-color', '').off('input', onInput);
 	};
 
+	/**
+	 * @typedef {object} SearchCursor
+	 * @property {() => boolean} findNext
+	 * @property {() => boolean} findPrevious
+	 * @property {() => CodeMirror.Position} from
+	 * @property {() => CodeMirror.Position} to
+	 */
+
 	// keyboard event handler of $search
-	let lastPtn, cursor;
+	let /** @type {string|RegExp} */ lastPtn,
+		/** @type {SearchCursor} */ cursor;
+	/**
+	 * @param {CodeMirror.Editor} cm
+	 * @param {boolean} dir
+	 */
 	const findNext = (cm, dir) => {
-		let ptn = $search.val();
+		let /** @type {string|RegExp} */ ptn = $search.val();
 		if (!ptn) {
 			return;
 		}
@@ -119,27 +137,35 @@
 			.scrollIntoView({behavior: 'smooth'});
 	};
 
-	// click event handler of $searchClose
+	/**
+	 * click event handler of $searchClose
+	 * @param {CodeMirror.Editor} cm
+	 */
 	const reset = cm => {
 		cm.removeOverlay(overlay);
 		$searchContainer.hide();
 		lastPtn = '';
 	};
 
+	/** @param {CodeMirror.Editor} doc */
 	CodeMirror.commands.findForward = doc => {
 		findNext(doc, true);
 	};
+	/** @param {CodeMirror.Editor} doc */
 	CodeMirror.commands.findBackward = doc => {
 		findNext(doc, false);
 	};
 
-	const {name} = $.client.profile(),
+	const /** @type {{name: string}} */ {name} = $.client.profile(),
 		focus = name === 'safari'
-			? cm => {
+			? /** @param {CodeMirror.Editor} cm */ cm => {
 				cm.focus();
 			}
 			: () => {};
-	mw.hook('wiki-codemirror').add(cm => {
+	mw.hook('wiki-codemirror').add(/** @param {CodeMirror.Editor} cm */ cm => {
+		if (!cm.getOption('styleSelectedText')) {
+			return;
+		}
 		const $textarea = $(cm.getWrapperElement()).prev('#Wikiplus-Quickedit');
 		if ($textarea.length === 0) {
 			return;