@bhsd/codemirror-mediawiki 2.4.5 → 2.5.0

package/mw/openLinks.ts

@@ -1,4 +1,5 @@
 import {isMac} from './msg';
+import type {SyntaxNode} from '@lezer/common';
 import type {CodeMirror} from './base';
 
 declare type MouseEventListener = (e: MouseEvent) => void;
@@ -7,6 +8,16 @@ const modKey = isMac ? 'metaKey' : 'ctrlKey',
 	regex = /-template-name|-link-pagename/u,
 	handlers = new WeakMap<CodeMirror, MouseEventListener>();
 
+/**
+ * 获取节点的名称
+ * @param node 语法树节点
+ */
+function getName(node: SyntaxNode): string;
+function getName(node: null): undefined;
+function getName(node: SyntaxNode | null): string | undefined {
+	return node?.name.replace(/_+/gu, ' ').trim();
+}
+
 /**
  * 点击时在新页面打开链接、模板等
  * @param cm
@@ -26,13 +37,13 @@ const getHandler = (cm: CodeMirror): MouseEventListener => {
 			return;
 		}
 		e.preventDefault();
-		const {name} = node;
+		const name = getName(node);
 		let prev = node,
 			next = node;
-		while (prev.prevSibling?.name === name) {
+		while (getName(prev.prevSibling!) === name) {
 			prev = prev.prevSibling!;
 		}
-		while (next.nextSibling?.name === name) {
+		while (getName(next.nextSibling!) === name) {
 			next = next.nextSibling!;
 		}
 		let page = view.state.sliceDoc(prev.from, next.to).trim();

package/mw/textSelection.ts

@@ -8,16 +8,6 @@ export const instances = new WeakMap<HTMLTextAreaElement, CodeMirror>();
  */
 const getInstance = ($ele: JQuery<HTMLTextAreaElement>): CodeMirror => instances.get($ele[0]!)!;
 
-function getCaretPosition(this: JQuery<HTMLTextAreaElement>, option: {startAndEnd: true}): [number, number];
-function getCaretPosition(this: JQuery<HTMLTextAreaElement>, option?: {startAndEnd?: false}): number;
-function getCaretPosition(
-	this: JQuery<HTMLTextAreaElement>,
-	option?: {startAndEnd?: boolean},
-): [number, number] | number {
-	const {view: {state: {selection: {main}}}} = getInstance(this);
-	return option?.startAndEnd ? [main.from, main.to] : main.head;
-}
-
 /**
  * jQuery.textSelection overrides for CodeMirror.
  * See jQuery.textSelection.js for method documentation
@@ -46,11 +36,16 @@ export const textSelection = {
 		return this;
 	},
 	replaceSelection(this: JQuery<HTMLTextAreaElement>, value: string): JQuery<HTMLTextAreaElement> {
-		const {view} = getInstance(this);
+		const {view} = getInstance(this),
+			{state: {selection: {main: {from, to}}}} = view;
+		view.dispatch({selection: {anchor: from, head: to}});
 		view.dispatch(view.state.replaceSelection(value));
 		return this;
 	},
-	getCaretPosition,
+	getCaretPosition(this: JQuery<HTMLTextAreaElement>, option?: {startAndEnd?: boolean}): [number, number] | number {
+		const {view: {state: {selection: {main}}}} = getInstance(this);
+		return option?.startAndEnd ? [main.from, main.to] : main.head;
+	},
 	scrollToCaretPosition(this: JQuery<HTMLTextAreaElement>): JQuery<HTMLTextAreaElement> {
 		getInstance(this).view.dispatch({scrollIntoView: true});
 		return this;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.4.5",
+	"version": "2.5.0",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",