@bhsd/codemirror-mediawiki 3.11.0 → 3.11.2

package/dist/openLinks.js

@@ -2,8 +2,7 @@ import { EditorView } from '@codemirror/view';
 import { ensureSyntaxTree } from '@codemirror/language';
 import { tokens } from './config.js';
 import { isMac } from './constants.js';
-import { hasTag } from './util.js';
-const tags = ['extLinkProtocol', 'extLink', 'freeExtLinkProtocol', 'freeExtLink', 'magicLink', 'pageName'], links = ['extlink-protocol', 'extlink', 'free-extlink-protocol', 'free-extlink', 'magic-link'], pagename = '.cm-mw-pagename', wikiLinks = [
+const links = ['extlink-protocol', 'extlink', 'free-extlink-protocol', 'free-extlink', 'magic-link'], pagename = '.cm-mw-pagename', wikiLinks = [
     'template-name',
     'link-pagename',
     `parserfunction${pagename}`,
@@ -36,21 +35,18 @@ export const mouseEventListener = (e, view, isbnParser, titleParser) => {
         || !(e.target instanceof Element && getComputedStyle(e.target).textDecorationLine === 'underline')) {
         return undefined;
     }
-    const position = view.posAtCoords(e);
-    if (!position) {
+    const posAndSide = view.posAndSideAtCoords(e);
+    if (!posAndSide) {
         return undefined;
     }
-    const { state } = view, tree = ensureSyntaxTree(state, position);
+    const { pos, assoc } = posAndSide, { state } = view, tree = ensureSyntaxTree(state, pos);
     if (!tree) {
         return undefined;
     }
-    let node = tree.resolve(position, -1);
+    let node = tree.resolve(pos, assoc);
     if (node.name.includes(tokens.linkToSection)) {
         node = node.prevSibling;
     }
-    else if (node.to === position && !hasTag(new Set(node.name.split('_')), tags)) {
-        node = tree.resolve(position, 1);
-    }
     const { name, from, to } = node;
     if (name.includes('-extlink-protocol')) {
         return wrapURL(state.sliceDoc(from, node.nextSibling.to));

package/dist/util.d.ts

@@ -3,7 +3,6 @@ import type { Text, EditorState, SelectionRange } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
 import type { Position } from 'vscode-languageserver-types';
 import type { ConfigGetter } from '@bhsd/browser';
-import type { TagName } from './config';
 /**
  * 转义HTML字符串
  * @param text 原字符串
@@ -56,13 +55,6 @@ export declare const isTemplate: (node: SyntaxNode) => boolean;
  * @test
  */
 export declare const findTemplateName: (state: EditorState, node: SyntaxNode) => [string | null, string];
-/**
- * 判断节点是否包含指定类型
- * @param types 节点类型
- * @param names 指定类型
- * @test
- */
-export declare const hasTag: (types: Set<string>, names: TagName | TagName[]) => boolean;
 export declare const toConfigGetter: (configGetter?: ConfigGetter, articlePath?: string) => ConfigGetter | undefined;
 /**
  * 获取字符串开头的空白字符

package/dist/util.js

@@ -109,13 +109,6 @@ export const findTemplateName = (state, node) => {
     }
     return [prevSibling && page, parameter];
 };
-/**
- * 判断节点是否包含指定类型
- * @param types 节点类型
- * @param names 指定类型
- * @test
- */
-export const hasTag = (types, names) => (Array.isArray(names) ? names : [names]).some(name => types.has(name in tokens ? tokens[name] : name));
 export const toConfigGetter = (configGetter, articlePath) => articlePath
     ? async () => Object.assign(await (configGetter ?? wikiparse.getConfig)(), { articlePath })
     : configGetter;