@bhsd/codemirror-mediawiki 3.12.2 → 3.12.3

package/dist/matchBrackets.js

@@ -51,6 +51,7 @@ export const trySelectMatchingBrackets = (state, pos, dir, config, inside = fals
 };
 /** @test */
 export const customSelection = {
+    0: state => ({ anchor: 0, head: state.doc.length }),
     2: (state, pos, config) => trySelectMatchingBrackets(state, pos, -1, config)
         || trySelectMatchingBrackets(state, pos, 1, config)
         || trySelectMatchingBrackets(state, pos + 1, -1, config, true)
@@ -66,7 +67,6 @@ export const customSelection = {
             head: Math.min(doc.length, (dir ? b : a).to + 1),
         };
     },
-    4: state => ({ anchor: 0, head: state.doc.length }),
 };
 const tryMatchBracetks = (state, pos, config) => matchBrackets(state, pos, -1, config)
     || pos > 0 && matchBrackets(state, pos - 1, 1, config)
@@ -97,8 +97,8 @@ export const myBracketDeco = (state, config) => {
 };
 const clickHandler = (e, view, facet, select) => {
     const pos = view.posAtCoords(e), { state } = view, config = state.facet(facet);
-    if (pos === null
-        || config.exclude?.(state, pos)) {
+    if (select !== customSelection[0] && (pos === null
+        || config.exclude?.(state, pos))) {
         return false;
     }
     const range = select(state, pos, config);
@@ -137,12 +137,10 @@ export default (configs) => {
     return [
         extension,
         EditorView.domEventHandlers({
-            /**
-             * @ignore
-             * @todo 由于括号高亮的重绘，双击会被识别为两次单击，导致功能失效
-             */
+            /** @ignore */
             mousedown(e, view) {
-                selection = e.detail in customSelection && clickHandler(e, view, facet, customSelection[e.detail]);
+                const n = e.detail % 4;
+                selection = e.detail > 0 && n in customSelection && clickHandler(e, view, facet, customSelection[n]);
                 return Boolean(selection);
             },
             /** @ignore */

package/dist/math.d.ts

@@ -0,0 +1,3 @@
+import type { StreamParser } from '@codemirror/language';
+/** @test */
+export declare const math: StreamParser<object>;

package/dist/math.js

@@ -0,0 +1,58 @@
+import { extCompletion, extData } from './constants.js';
+import { getCompletions } from './util.js';
+let mathFetch;
+/** @test */
+export const math = {
+    startState() {
+        if (typeof wikiparse === 'object') {
+            mathFetch ??= (async () => {
+                const data = await (await fetch(`${wikiparse.CDN}/data/ext/math.json`)).json();
+                extData['math'] = new Set(data);
+                extCompletion['math'] = getCompletions(data);
+            })();
+        }
+        return {};
+    },
+    token(stream) {
+        if (stream.eatSpace()) {
+            return '';
+        }
+        const ch = stream.next();
+        switch (ch) {
+            case '\\':
+                if (stream.eatWhile(/[a-z]/iu)) {
+                    return extData['math']?.has(stream.current()) === false ? '' : /* #708 */ 'keyword';
+                }
+                else if (stream.eat(/[,;!\\]/u)) {
+                    return /* #708 */ 'keyword';
+                }
+                return stream.eat(/[$&%#{}_]/u) ? /* #219 */ 'atom' : /* #f00 */ 'invalid';
+            case '^':
+            case '_':
+            case '&':
+                return 'operator';
+            case '{':
+            case '}':
+                return 'brace';
+            case '[':
+            case ']':
+                return 'squareBracket';
+            case '(':
+            case ')':
+                return 'paren';
+            case '.':
+                return stream.eatWhile(/\d/u) ? /* #164 */ 'number' : '';
+            default:
+                if (/\d/u.test(ch)) {
+                    stream.match(/\d*(?:\.\d*)?/u);
+                    return /* #164 */ 'number';
+                }
+                else if (/[a-z]/iu.test(ch)) {
+                    stream.eatWhile(/[a-z]/iu);
+                    return /* #256 */ 'variableName.special';
+                }
+                stream.eatWhile(/[^\\^&{}[\]().\w]/u);
+                return '';
+        }
+    },
+};

package/dist/mediawiki.d.ts

@@ -43,7 +43,7 @@ export declare class FullMediaWiki extends MediaWiki {
     readonly protocols: Completion[];
     readonly imgKeys: Completion[];
     readonly htmlAttrs: Completion[];
-    readonly elementAttrs: Map<string | undefined, Completion[]>;
+    readonly elementAttrs: Map<string, Completion[]>;
     readonly extAttrs: Map<string, Completion[]>;
     constructor(config: MwConfig, templatedata?: boolean);
     /**

package/dist/mediawiki.js

@@ -9,10 +9,10 @@ import { insertCompletionText, pickedCompletion } from '@codemirror/autocomplete
 import { isUnderscore } from '@bhsd/cm-util';
 import { commonHtmlAttrs, htmlAttrs, extAttrs } from 'wikiparser-node/dist/util/sharable.mjs';
 import { htmlTags, tokens } from './config.js';
-import { hoverSelector, isWMF, } from './constants.js';
+import { hoverSelector, extCompletion, isWMF, } from './constants.js';
 import { lightHighlightStyle } from './theme.js';
 import { MediaWiki } from './token.js';
-import { leadingSpaces, findTemplateName } from './util.js';
+import { getCompletions, getExtTags, leadingSpaces, findTemplateName, } from './util.js';
 const ranks = { Required: 1, Suggested: 2, Optional: 3, Deprecated: 4 };
 /**
  * 是否是普通维基链接
@@ -67,15 +67,9 @@ export class FullMediaWiki extends MediaWiki {
             type: i ? 'constant' : 'function',
             label,
         })));
-        this.doubleUnderscore = doubleUnderscore.flatMap(Object.keys).filter(isUnderscore).map((label) => ({
-            type: 'constant',
-            label,
-        }));
-        this.extTags = this.tags.map((label) => ({ type: 'type', label }));
-        this.htmlTags = htmlTags.filter(tag => !this.tags.includes(tag)).map((label) => ({
-            type: 'type',
-            label,
-        }));
+        this.doubleUnderscore = getCompletions(doubleUnderscore.flatMap(Object.keys).filter(isUnderscore), 'constant');
+        this.extTags = getCompletions(this.tags, 'type');
+        this.htmlTags = getCompletions(htmlTags.filter(tag => !this.tags.includes(tag)), 'type');
         this.protocols = urlProtocols.split('|').map((label) => ({
             type: 'namespace',
             label: label.replace(/\\\//gu, '/'),
@@ -84,17 +78,17 @@ export class FullMediaWiki extends MediaWiki {
             ? { type: 'property', label: label.slice(0, -2), detail: '$1' }
             : { type: 'keyword', label });
         this.htmlAttrs = [
-            ...[...commonHtmlAttrs].map((label) => ({ type: 'property', label })),
+            ...getCompletions([...commonHtmlAttrs], 'property'),
             { type: 'variable', label: 'data-', detail: '*' },
             { type: 'namespace', label: 'xmlns:', detail: '*' },
         ];
         this.elementAttrs = new Map(Object.entries(htmlAttrs).map(([key, value]) => [
             key,
-            [...value].map((label) => ({ type: 'property', label })),
+            getCompletions([...value], 'property'),
         ]));
         this.extAttrs = new Map(Object.entries(extAttrs).map(([key, value]) => [
             key,
-            [...value].map((label) => ({ type: 'property', label })),
+            getCompletions([...value], 'property'),
         ]));
     }
     /**
@@ -305,6 +299,26 @@ export class FullMediaWiki extends MediaWiki {
                 // 不可能是状态开关、标签、协议或图片参数名
                 return null;
             }
+            else if ('math' in extCompletion
+                && hasTag(types, ['mw-tag-math', 'mw-tag-chem', 'mw-tag-ce'])
+                && (types.size === 1 || types.has('keyword') || types.has('invalid'))) {
+                const mt = context.matchBefore(/\\[a-z]*$/iu);
+                return mt && {
+                    from: mt.from,
+                    options: extCompletion['math'],
+                    validFor: /^[a-z]*$/iu,
+                };
+            }
+            else if ('score' in extCompletion
+                && hasTag(types, 'mw-tag-score')
+                && (types.size === 1 || types.has('keyword'))) {
+                const mt = context.matchBefore(/\\[-a-z]*$/iu);
+                return mt && {
+                    from: mt.from,
+                    options: extCompletion['score'],
+                    validFor: /^[-a-z]*$/iu,
+                };
+            }
             let mt = context.matchBefore(/__(?:(?!__)[\p{L}\p{N}_])*$/u);
             if (mt) {
                 return {
@@ -314,8 +328,7 @@ export class FullMediaWiki extends MediaWiki {
                 };
             }
             mt = context.matchBefore(/<\/?[a-z\d]*$/iu);
-            const extTags = [...types].filter(type => type.startsWith('mw-tag-'))
-                .map(s => s.slice(7));
+            const extTags = getExtTags([...types]);
             if (mt && (explicit || mt.to - mt.from > 1)) {
                 const validFor = /^[a-z\d]*$/iu;
                 if (mt.text[1] === '/') {
@@ -478,7 +491,7 @@ const wikiTheme = /* @__PURE__ */ EditorView.theme({
     '.cm-mw-entity': {
         color: 'var(--cm-entity)',
     },
-    '.cm-mw-exttag': {
+    '.cm-mw-exttag,.cm-mw-tag-score-scheme': {
         backgroundColor: 'rgb(119,0,170,.04)',
     },
     /* eslint-disable no-sparse-arrays */