@bhsd/codemirror-mediawiki 3.7.1 → 3.8.1

package/dist/openLinks.js

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

package/dist/ref.d.ts

@@ -1,4 +1,4 @@
+import { CodeMirror6 } from './codemirror';
 import type { Extension } from '@codemirror/state';
-import type { CodeMirror6 } from './codemirror';
 declare const _default: (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/ref.js

@@ -5,6 +5,7 @@ import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
 import { tokens } from './config';
 import { getTag } from './matchTag';
+import { CodeMirror6 } from './codemirror';
 import { indexToPos, posToIndex, escHTML } from './util';
 const trees = new WeakMap(), selector = '.cm-tooltip-ref', noDef = '.cm-tooltip-no-def';
 /**
@@ -44,7 +45,7 @@ export default (cm) => [
                         target = target.slice(1, target.slice(-1) === quote ? -1 : undefined).trim();
                     }
                     if (target) {
-                        const { doc } = state, ref = await getLSP(view, false, cm.getWikiConfig)
+                        const { doc } = state, ref = await getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN)
                             ?.provideDefinition(doc.toString(), indexToPos(doc, first.to));
                         return {
                             pos,

package/dist/signature.d.ts

@@ -1,4 +1,4 @@
+import { CodeMirror6 } from './codemirror';
 import type { Extension } from '@codemirror/state';
-import type { CodeMirror6 } from './codemirror';
 declare const _default: (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/signature.js

@@ -2,6 +2,7 @@ import { EditorView, showTooltip } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
 import { getLSP } from '@bhsd/browser';
 import { createTooltipView, indexToPos, escHTML } from './util';
+import { CodeMirror6 } from './codemirror';
 const stateEffect = StateEffect.define(), field = StateField.define({
     create() {
         return undefined;
@@ -35,7 +36,7 @@ export default (cm) => [
                     effects: stateEffect.of({
                         text,
                         cursor,
-                        signatureHelp: await getLSP(view, false, cm.getWikiConfig)
+                        signatureHelp: await getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN)
                             ?.provideSignatureHelp(text, indexToPos(doc, cursor)),
                     }),
                 });

package/dist/statusBar.js

@@ -1,5 +1,6 @@
 import { showPanel, EditorView } from '@codemirror/view';
 import { nextDiagnostic, setDiagnosticsEffect } from '@codemirror/lint';
+import { gotoLine } from '@codemirror/search';
 import elt from 'crelt';
 import { menuRegistry } from './codemirror';
 import { panelSelector, diagnosticSelector, menuSelector, messageSelector, actionSelector } from './constants';
@@ -113,6 +114,9 @@ export default (cm, fixer) => [
             view.dom.append(menu);
         }
         const error = getLintMarker(view, 'error'), warning = getLintMarker(view, 'warning'), fix = getLintMarker(view, 'fix', menu), 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), { classList } = fix.firstChild;
+        position.addEventListener('click', () => {
+            gotoLine(view);
+        });
         return {
             dom,
             update({ state: { selection: { main }, doc }, transactions, docChanged, selectionSet }) {
@@ -217,6 +221,7 @@ export default (cm, fixer) => [
             paddingBottom: 0,
         },
         [`.${lineCls}`]: {
+            cursor: 'pointer',
             whiteSpace: 'nowrap',
         },
         [diagnosticSelector]: {