wikiplus-highlight 2.8.0 → 2.12.1

package/matchtags.js

@@ -10,7 +10,8 @@
 	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 {
 		/**
@@ -18,9 +19,7 @@
 		 * @param {CodeMirror.Position} pos
 		 */
 		constructor(cm, pos) {
-			const {line, ch} = pos,
-				/** @type {{state: {matchTags: {maxScanLines: number}}}} */
-				{state: {matchTags: {maxScanLines = 1000}}} = cm;
+			const {line, ch} = pos;
 			this.line = line;
 			this.ch = ch;
 			this.cm = cm;
@@ -138,7 +137,10 @@
 			}
 		}
 
-		/** @param {string} tag */
+		/**
+		 * @param {string} tag
+		 * @returns {CodeMirror.matchingTag}
+		 */
 		findMatchingClose(tag) {
 			const /** @type {string[]} */ stack = [];
 			for (;;) {
@@ -176,7 +178,10 @@
 			}
 		}
 
-		/** @param {string} tag */
+		/**
+		 * @param {string|undefined} tag
+		 * @returns {CodeMirror.matchingTag}
+		 */
 		findMatchingOpen(tag) {
 			const /** @type {string[]} */ stack = [];
 			for (;;) {
@@ -215,35 +220,43 @@
 		}
 	}
 
-	CodeMirror.defineExtension('findMatchingTag', /** @param {CodeMirror.Position} pos */ function(pos) {
-		let iter = new Iter(this, pos);
-		if (!iter.isTag()) {
-			return;
-		}
-		const end = iter.toTagEnd(),
-			to = end && Pos(iter.line, iter.ch);
-		const start = end && iter.toTagStart();
-		if (!start || cmpPos(iter, pos) > 0) {
-			return;
-		}
-		const tag = start[2].toLowerCase(),
-			here = {from: Pos(iter.line, iter.ch), to, tag};
-		if (end === 'selfClose' || voidTags.includes(tag)) {
-			return {open: here, close: null, at: 'self'};
-		}
+	CodeMirror.defineExtension(
+		'findMatchingTag',
+		/**
+		 * @param {CodeMirror.Position} pos
+		 * @returns {CodeMirror.matchingTags}
+		 */
+		function(pos) {
+			let iter = new Iter(this, pos);
+			if (!iter.isTag()) {
+				return;
+			}
+			const end = iter.toTagEnd(),
+				to = end && Pos(iter.line, iter.ch);
+			const start = end && iter.toTagStart();
+			if (!start || cmpPos(iter, pos) > 0) {
+				return;
+			}
+			const tag = start[2].toLowerCase(),
+				here = {from: Pos(iter.line, iter.ch), to, tag};
+			if (end === 'selfClose' || voidTags.includes(tag)) {
+				return {open: here, close: null, at: 'self'};
+			}
 
-		if (start[1]) { // closing tag
-			return {open: iter.findMatchingOpen(tag), close: here, at: 'close'};
-		} // opening tag
-		iter = new Iter(this, to);
-		return {open: here, close: iter.findMatchingClose(tag), at: 'open'};
-	});
+			if (start[1]) { // closing tag
+				return {open: iter.findMatchingOpen(tag), close: here, at: 'close'};
+			} // opening tag
+			iter = new Iter(this, to);
+			return {open: here, close: iter.findMatchingClose(tag), at: 'open'};
+		},
+	);
 
 	CodeMirror.defineExtension(
 		'findEnclosingTag',
 		/**
 		 * @param {CodeMirror.Position} pos
 		 * @param {string} tag
+		 * @returns {CodeMirror.matchingTags}
 		 */
 		function(pos, tag) {
 			const iter = new Iter(this, pos);
@@ -259,12 +272,7 @@
 		},
 	);
 
-	/**
-	 * Used by addon/edit/closetag.js
-	 * @param {CodeMirror.Editor} cm
-	 * @param {CodeMirror.Position} pos
-	 * @param {string} name
-	 */
+	// Used by addon/edit/closetag.js
 	CodeMirror.scanForClosingTag = function(cm, pos, name) {
 		const iter = new Iter(cm, pos);
 		return iter.findMatchingClose(name);
@@ -276,13 +284,12 @@
 			clear(cm);
 		}
 		if (val) {
-			cm.state.matchTags = typeof val === 'object' ? val : {};
 			cm.on('cursorActivity', doMatchTags);
 			doMatchTags(cm);
 		}
 	});
 
-	/** @param {CodeMirror.Editor} cm */
+	/** @param {CodeMirror.EditorWithMatchingTags} cm */
 	function clear(cm) {
 		if (cm.state.tagHit) {
 			cm.state.tagHit.clear();
@@ -294,22 +301,14 @@
 		cm.state.tagOther = null;
 	}
 
-	/** @param {CodeMirror.Editor} cm */
+	/** @param {CodeMirror.EditorWithMatchingTags} cm */
 	function doMatchTags(cm) {
 		cm.operation(() => {
 			clear(cm);
 			if (cm.somethingSelected()) {
 				return;
 			}
-
-			/**
-			 * @typedef {object} matchingTag
-			 * @property {string} at
-			 * @property {{from: CodeMirror.Position, to: CodeMirror.Position}} open
-			 * @property {{from: CodeMirror.Position, to: CodeMirror.Position}} close
-			 */
-
-			const /** @type {matchingTag}} */ match = cm.findMatchingTag(cm.getCursor());
+			const match = cm.findMatchingTag(cm.getCursor());
 			if (!match) {
 				return;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikiplus-highlight",
-  "version": "2.8.0",
+  "version": "2.12.1",
   "description": "A plugin for the MediaWiki front-end add-on \"Wikiplus\"",
   "main": "main.js",
   "scripts": {
@@ -23,6 +23,7 @@
   "homepage": "https://github.com/bhsd-harry/Wikiplus-highlight#readme",
   "devDependencies": {
     "eslint": "^8.8.0",
+    "types-mediawiki": "^1.2.0",
     "uglify-js": "^3.15.5"
   }
 }

package/search.js

@@ -1,15 +1,12 @@
 /**
  * @author Bhsd <https://github.com/bhsd-harry>
- * @license: GPL-3.0
+ * @license GPL-3.0
  */
 
 (() => {
 	'use strict';
 
-	/**
-	 * @param {string} key
-	 * @returns {string}
-	 */
+	/** @param {string} key */
 	const msg = key => mw.msg(`wphl-${key}`);
 
 	// Prepare elements
@@ -46,7 +43,7 @@
 			text: msg('addon-search'),
 		});
 
-	const /** @type {(str: string) => string} */ escapeRegExp = mw.util.escapeRegExp || mw.RegExp.escape;
+	const escapeRegExp = mw.util.escapeRegExp || mw.RegExp.escape;
 	const /** @type {{token: (stream: CodeMirror.StringStream) => string}} */ overlay = {token: () => {}};
 
 	/**
@@ -74,17 +71,9 @@
 		$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 /** @type {string|RegExp} */ lastPtn,
-		/** @type {SearchCursor} */ cursor;
+		/** @type {CodeMirror.SearchCursor} */ cursor;
 	/**
 	 * @param {CodeMirror.Editor} cm
 	 * @param {boolean} dir
@@ -108,7 +97,7 @@
 			cursor = cm.getSearchCursor(ptn, cm.getCursor(), {caseFold: true});
 		}
 		const method = dir ? 'findNext' : 'findPrevious';
-		let result = cursor[method]();
+		let /** @type {boolean} */ result = cursor[method]();
 		if (!result) {
 			if (dir) {
 				cursor = cm.getSearchCursor(ptn, {line: 0, ch: 0}, {caseFold: true});
@@ -147,22 +136,23 @@
 		lastPtn = '';
 	};
 
-	/** @param {CodeMirror.Editor} doc */
 	CodeMirror.commands.findForward = doc => {
 		findNext(doc, true);
 	};
-	/** @param {CodeMirror.Editor} doc */
 	CodeMirror.commands.findBackward = doc => {
 		findNext(doc, false);
 	};
 
-	const /** @type {{name: string}} */ {name} = $.client.profile(),
+	const {name} = $.client.profile(),
 		focus = name === 'safari'
 			? /** @param {CodeMirror.Editor} cm */ cm => {
 				cm.focus();
 			}
 			: () => {};
 	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;