@bhsd/codemirror-mediawiki 3.11.1 → 3.11.3

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/statusBar.js

@@ -92,6 +92,13 @@ const updateMenu = (cm, allDiagnostics, main, classList, optionAll, menu, fixer)
         menu.replaceChildren(...actions, ...quickfix);
     }
 };
+const updatePosition = (doc, { head, empty, from, to }, position) => {
+    const { number, from: f } = doc.lineAt(head);
+    position.textContent = `${number}:${head - f}`;
+    if (!empty) {
+        position.textContent += ` (${to - from})`;
+    }
+};
 export default (cm, fixer) => [
     showPanel.of(view => {
         let diagnostics = [];
@@ -119,10 +126,11 @@ export default (cm, fixer) => [
             });
             view.dom.append(menu);
         }
-        const error = getLintMarker(view, 'error'), warning = getLintMarker(view, 'warning'), fix = getLintMarker(view, 'fix', menu), { classList } = fix.firstChild, optionAll = elt('div', 'Fix all auto-fixable problems'), worker = elt('div', { class: workerSelector.slice(1) }, error, warning, fix), message = elt('div', { class: messageSelector.slice(1) }), position = elt('div', { class: lineCls }, '0:0'), dom = elt('div', { class: `${panelSelector.slice(1)} ${statusSelector.slice(1)}` }, worker, message, position);
+        const error = getLintMarker(view, 'error'), warning = getLintMarker(view, 'warning'), fix = getLintMarker(view, 'fix', menu), { classList } = fix.firstChild, optionAll = elt('div', 'Fix all auto-fixable problems'), worker = elt('div', { class: workerSelector.slice(1) }, error, warning, fix), message = elt('div', { class: messageSelector.slice(1) }), position = elt('div', { class: lineCls }), dom = elt('div', { class: `${panelSelector.slice(1)} ${statusSelector.slice(1)}` }, worker, message, position);
         position.addEventListener('click', () => {
             gotoLine(view);
         });
+        updatePosition(view.state.doc, view.state.selection.main, position);
         return {
             dom,
             update({ state: { selection: { main }, doc }, transactions, docChanged, selectionSet }) {
@@ -141,11 +149,7 @@ export default (cm, fixer) => [
                 if (docChanged || selectionSet) {
                     updateDiagnosticMessage(view, diagnostics, main, message);
                     updateMenu(cm, diagnostics, main, classList, optionAll, menu, fixer);
-                    const { number, from } = doc.lineAt(main.head);
-                    position.textContent = `${number}:${main.head - from}`;
-                    if (!main.empty) {
-                        position.textContent += ` (${main.to - main.from})`;
-                    }
+                    updatePosition(doc, main, position);
                 }
             },
         };

package/dist/token.js

@@ -996,8 +996,8 @@ let MediaWiki = (() => {
         eatDoubleUnderscore(style, ch, stream, state) {
             const { doubleUnderscore } = this.config, underscore = ch.repeat(2), name = stream.match(doubleUnderscoreRegex[ch]);
             if (name) {
-                if (Object.prototype.hasOwnProperty.call(doubleUnderscore[0], underscore + name[0].toLowerCase())
-                    || Object.prototype.hasOwnProperty.call(doubleUnderscore[1], underscore + name[0])) {
+                if (Object.hasOwn(doubleUnderscore[0], underscore + name[0].toLowerCase())
+                    || Object.hasOwn(doubleUnderscore[1], underscore + name[0])) {
                     return tokens.doubleUnderscore;
                 }
                 else if (!stream.eol()) {
@@ -1421,10 +1421,8 @@ let MediaWiki = (() => {
                 else if (delimiter !== ':') {
                     ff = f.trim();
                 }
-                const ffLower = ff.toLowerCase(), { functionSynonyms, variableIDs, functionHooks } = this.config, canonicalName = Object.prototype.hasOwnProperty.call(functionSynonyms[1], ff)
-                    && functionSynonyms[1][ff]
-                    || Object.prototype.hasOwnProperty.call(functionSynonyms[0], ffLower)
-                        && functionSynonyms[0][ffLower];
+                const ffLower = ff.toLowerCase(), { functionSynonyms, variableIDs, functionHooks } = this.config, canonicalName = Object.hasOwn(functionSynonyms[1], ff) && functionSynonyms[1][ff]
+                    || Object.hasOwn(functionSynonyms[0], ffLower) && functionSynonyms[0][ffLower];
                 if ((!delimiter || fullWidth || delimiter === ':' || delimiter === '}')
                     && canonicalName
                     && !substs.has(canonicalName)

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;