@bhsd/codemirror-mediawiki 2.7.1 → 2.7.3

package/mw/openLinks.ts

@@ -5,7 +5,6 @@ import type {CodeMirror} from './base';
 declare type MouseEventListener = (e: MouseEvent) => void;
 
 const modKey = isMac ? 'metaKey' : 'ctrlKey',
-	regex = /-template-name|-link-pagename/u,
 	handlers = new WeakMap<CodeMirror, MouseEventListener>();
 
 /**
@@ -18,6 +17,19 @@ function getName(node: SyntaxNode | null): string | undefined {
 	return node?.name.replace(/_+/gu, ' ').trim();
 }
 
+/**
+ * 查找连续同名节点
+ * @param node 起始节点
+ * @param dir 方向
+ * @param name 节点名称
+ */
+const search = (node: SyntaxNode, dir: 'prevSibling' | 'nextSibling', name = getName(node)): SyntaxNode => {
+	while (getName(node[dir]!) === name) {
+		node = node[dir]!; // eslint-disable-line no-param-reassign
+	}
+	return node;
+};
+
 /**
  * 点击时在新页面打开链接、模板等
  * @param cm
@@ -32,25 +44,31 @@ const getHandler = (cm: CodeMirror): MouseEventListener => {
 			return;
 		}
 		const {view} = cm,
+			{state} = view,
 			node = cm.getNodeAt(view.posAtCoords(e)!);
-		if (!node || !regex.test(node.name)) {
-			return;
-		}
-		e.preventDefault();
-		const name = getName(node);
-		let prev = node,
-			next = node;
-		while (getName(prev.prevSibling!) === name) {
-			prev = prev.prevSibling!;
-		}
-		while (getName(next.nextSibling!) === name) {
-			next = next.nextSibling!;
-		}
-		let page = view.state.sliceDoc(prev.from, next.to).trim();
-		if (page.startsWith('/')) {
-			page = `:${mw.config.get('wgPageName')}${page}`;
+		if (!node) {
+			// pass
+		} else if (/-template-name|-link-pagename/u.test(node.name)) {
+			e.preventDefault();
+			const name = getName(node);
+			let page = state.sliceDoc(
+				search(node, 'prevSibling', name).from,
+				search(node, 'nextSibling', name).to,
+			).trim();
+			if (page.startsWith('/')) {
+				page = `:${mw.config.get('wgPageName')}${page}`;
+			}
+			open(new mw.Title(page, name.includes('-template-name') ? 10 : 0).getUrl(undefined), '_blank');
+		} else if (/-extlink-protocol/u.test(node.name)) {
+			e.preventDefault();
+			open(state.sliceDoc(node.from, search(node.nextSibling!, 'nextSibling').to), '_blank');
+		} else if (/-extlink(?:_|$)/u.test(node.name)) {
+			e.preventDefault();
+			const name = getName(node),
+				prev = search(node, 'prevSibling', name).prevSibling!,
+				next = search(node, 'nextSibling', name);
+			open(state.sliceDoc(prev.from, next.to), '_blank');
 		}
-		open(new mw.Title(page, name.includes('-template-name') ? 10 : 0).getUrl(undefined), '_blank');
 	};
 	handlers.set(cm, handler);
 	return handler;

package/mw/preference.ts

@@ -75,6 +75,16 @@ export const loadJSON = (async () => {
 			const {query: {pages: [page]}} = res as MediaWikiResponse;
 			if (page?.revisions) {
 				const json: Preferences = JSON.parse(page.revisions[0]!.content);
+				if (!json.addons?.includes('save')) {
+					return;
+				}
+				prefs.clear();
+				for (const option of json.addons) {
+					prefs.add(option);
+				}
+				if (json.indent) {
+					localStorage.setItem(indentKey, json.indent);
+				}
 				for (const key of codeKeys) {
 					if (json[key]) {
 						codeConfigs.set(key, json[key]);
@@ -83,15 +93,6 @@ export const loadJSON = (async () => {
 				if (json.wikilint) {
 					Object.assign(wikilintConfig, json.wikilint);
 				}
-				if (json.addons) {
-					prefs.clear();
-					for (const option of json.addons) {
-						prefs.add(option);
-					}
-				}
-				if (json.indent) {
-					localStorage.setItem(indentKey, json.indent);
-				}
 			}
 		},
 		apiErr,
@@ -164,7 +165,7 @@ export const openPreference = async (editors: (CodeMirror | undefined)[]): Promi
 			$('<p>', {html: msg('feedback', 'codemirror-mediawiki')}),
 		);
 		panelWikilint.$element.append(
-			...rules.map(rule => {
+			...rules.filter(rule => rule !== 'table-layout').map(rule => {
 				const state = rule === 'no-arg' ? RuleState.off : RuleState.error,
 					dropdown = new OO.ui.DropdownInputWidget({
 						options: [
@@ -193,7 +194,8 @@ export const openPreference = async (editors: (CodeMirror | undefined)[]): Promi
 	}).closing as unknown as Promise<{action?: unknown} | undefined>);
 	if (typeof data === 'object' && data.action === 'accept') {
 		// 缩进
-		const oldIndent = indent;
+		const oldIndent = indent,
+			save = prefs.has('save');
 		indent = indentWidget.getValue(); // eslint-disable-line require-atomic-updates
 		let changed = indent !== oldIndent;
 		if (changed) {
@@ -242,7 +244,7 @@ export const openPreference = async (editors: (CodeMirror | undefined)[]): Promi
 		}
 
 		// 保存至用户子页面
-		if (changed && user && prefs.has('save')) {
+		if (changed && user && (save || prefs.has('save'))) {
 			const params: ApiEditPageParams = {
 				action: 'edit',
 				title: userPage,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.7.1",
+	"version": "2.7.3",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -53,7 +53,7 @@
 		"@codemirror/state": "^6.4.1",
 		"@codemirror/view": "^6.24.1",
 		"@lezer/highlight": "^1.2.0",
-		"wikiparser-node": "^1.5.3"
+		"wikiparser-node": "^1.5.6"
 	},
 	"devDependencies": {
 		"@lezer/common": "^1.1.2",