@bhsd/codemirror-mediawiki 3.12.1 → 3.12.3

package/dist/ref.d.ts

@@ -1,6 +1,6 @@
 import type { EditorState, Extension } from '@codemirror/state';
 import type { CodeMirror6 } from './codemirror';
-import type { Tag } from './matchTag';
+import type { WikiTag } from './matchTag';
 /**
  * 高亮<ref>内容
  * @param state 编辑器EditorState
@@ -13,6 +13,6 @@ export declare const highlightRef: (state: EditorState, text: string) => string;
  * @ignore
  * @test
  */
-export declare const needHover: (state: EditorState, { name, selfClosing, first, last }: Tag) => boolean;
+export declare const needHover: (state: EditorState, { name, selfClosing, first, last }: WikiTag) => boolean;
 declare const _default: (articlePath?: string) => (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/ref.js

@@ -3,7 +3,7 @@ import { ensureSyntaxTree, language, highlightingFor } from '@codemirror/languag
 import { highlightCode } from '@lezer/highlight';
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
-import { base } from './constants.js';
+import { baseData } from './constants.js';
 import { tokens } from './config.js';
 import { getTag } from './matchTag.js';
 import { sliceDoc, indexToPos, posToIndex, escHTML, toConfigGetter, } from './util.js';
@@ -13,7 +13,7 @@ const trees = new WeakMap(), selector = '.cm-tooltip-ref', noDef = '.cm-tooltip-
  * @param state
  * @param node 语法树节点
  */
-const getName = (state, node) => sliceDoc(state, node).trim();
+const getRefName = (state, node) => sliceDoc(state, node).trim();
 /**
  * 高亮<ref>内容
  * @param state 编辑器EditorState
@@ -45,7 +45,7 @@ export const needHover = (state, { name, selfClosing, first, last }) => {
     if (name === 'ref' && selfClosing) {
         let prevSibling = last, nextSibling = null;
         while (prevSibling && prevSibling.from > first.to) {
-            const key = getName(state, prevSibling);
+            const key = getRefName(state, prevSibling);
             if (prevSibling.name.split('_').includes(tokens.extTagAttribute)
                 && /(?:^|\s)name(?:$|[\s=])/iu.test(key)) {
                 if (/(?:^|\s)name\s*=/iu.test(key)) {
@@ -56,7 +56,7 @@ export const needHover = (state, { name, selfClosing, first, last }) => {
             ({ prevSibling } = prevSibling);
         }
         if (nextSibling?.name.includes(tokens.extTagAttributeValue)) {
-            let target = getName(state, nextSibling);
+            let target = getRefName(state, nextSibling);
             const quote = target.charAt(0);
             if (quote === '"' || quote === "'") {
                 target = target.slice(1, target.slice(-1) === quote ? -1 : undefined).trim();
@@ -75,7 +75,7 @@ export default (articlePath) => (cm) => {
             if (node?.name.includes('-exttag-')) {
                 const tag = getTag(state, node);
                 if (tag && needHover(state, tag)) {
-                    const { doc } = state, ref = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideDefinition(doc.toString(), indexToPos(doc, tag.first.to));
+                    const { doc } = state, ref = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), baseData.CDN)?.provideDefinition(doc.toString(), indexToPos(doc, tag.first.to));
                     return {
                         pos,
                         end: tag.to,

package/dist/signature.js

@@ -2,16 +2,16 @@ import { EditorView, showTooltip } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
 import { syntaxTree } from '@codemirror/language';
 import { getLSP } from '@bhsd/browser';
-import { base } from './constants.js';
-import { createTooltipView, indexToPos, escHTML, toConfigGetter, findTemplateName, isTemplate, } from './util.js';
-const stateEffect = StateEffect.define(), field = StateField.define({
+import { baseData } from './constants.js';
+import { createTooltipView, indexToPos, escHTML, toConfigGetter, findTemplateName, isTemplateParam, } from './util.js';
+const signatureEffect = StateEffect.define(), signatureField = StateField.define({
     create() {
         return undefined;
     },
     update(oldValue, { state: { doc, selection: { main: { head } } }, effects }) {
         const text = doc.toString();
         for (const effect of effects) {
-            if (effect.is(stateEffect)) {
+            if (effect.is(signatureEffect)) {
                 const { value } = effect;
                 if (head === value.cursor && text === value.text) {
                     return value;
@@ -40,25 +40,25 @@ export const getSignatureHelp = ({ signatures, activeParameter: active }) => sig
 }).join('<br>');
 export default (articlePath) => (cm) => {
     return [
-        field,
+        signatureField,
         EditorView.updateListener.of(({ view, state, docChanged, selectionSet }) => {
-            if (docChanged || selectionSet && state.field(field)?.signatureHelp?.signatures.length) {
+            if (docChanged || selectionSet && state.field(signatureField)?.signatureHelp?.signatures.length) {
                 const { doc, selection: { main } } = state, { head: cursor } = main, text = doc.toString();
                 if (!main.empty) {
                     view.dispatch({
-                        effects: stateEffect.of({ text, cursor }),
+                        effects: signatureEffect.of({ text, cursor }),
                     });
                     return;
                 }
                 (async () => {
-                    let signatureHelp = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideSignatureHelp(text, indexToPos(doc, cursor));
+                    let signatureHelp = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), baseData.CDN)?.provideSignatureHelp(text, indexToPos(doc, cursor));
                     if (!signatureHelp && typeof cm.langConfig?.templateSignature === 'function') {
                         const tree = syntaxTree(state);
                         let node = tree.resolve(cursor, -1);
-                        if (node.to === cursor && !isTemplate(node)) {
+                        if (node.to === cursor && !isTemplateParam(node)) {
                             node = tree.resolve(cursor, 1);
                         }
-                        if (isTemplate(node)) {
+                        if (isTemplateParam(node)) {
                             const [templateName, parameterName] = findTemplateName(state, node), tooltip = cm.langConfig.templateSignature(templateName, parameterName);
                             if (tooltip) {
                                 signatureHelp = { signatures: [tooltip] };
@@ -66,7 +66,7 @@ export default (articlePath) => (cm) => {
                         }
                     }
                     view.dispatch({
-                        effects: stateEffect.of({ text, cursor, signatureHelp }),
+                        effects: signatureEffect.of({ text, cursor, signatureHelp }),
                     });
                 })();
             }
@@ -76,12 +76,12 @@ export default (articlePath) => (cm) => {
                 if (key === 'Escape') {
                     const { doc, selection: { main: { head } } } = view.state;
                     view.dispatch({
-                        effects: stateEffect.of({ text: doc.toString(), cursor: head }),
+                        effects: signatureEffect.of({ text: doc.toString(), cursor: head }),
                     });
                 }
             },
         }),
-        showTooltip.from(field, (value) => {
+        showTooltip.from(signatureField, (value) => {
             if (!value) {
                 return null;
             }

package/dist/static.d.ts

@@ -21,6 +21,13 @@ export declare const tagModes: {
     combobox: string;
     combooption: string;
     inputbox: string;
+    templatedata: string;
+    maplink: string;
+    mapframe: string;
+    math: string;
+    chem: string;
+    ce: string;
+    score: string;
 };
 /**
  * @ignore

package/dist/static.js

@@ -20,6 +20,13 @@ export const tagModes = {
     combobox: 'text/combobox',
     combooption: 'mediawiki',
     inputbox: 'text/inputbox',
+    templatedata: 'json',
+    maplink: 'jsonc',
+    mapframe: 'jsonc',
+    math: 'text/math',
+    chem: 'text/math',
+    ce: 'text/math',
+    score: 'lilypond',
 };
 /**
  * @ignore

package/dist/theme.d.ts

@@ -6,4 +6,4 @@ export declare const light: Extension,
  * @author Bhsd
  * @see https://zh.moegirl.org.cn/User:%E9%AC%BC%E5%BD%B1233/nord-moeskin.css
  */
-nord: Extension;
+nordDark: Extension;

package/dist/theme.js

@@ -1,6 +1,6 @@
 import { EditorView } from '@codemirror/view';
 import { syntaxHighlighting, HighlightStyle, defaultHighlightStyle } from '@codemirror/language';
-import { nord as nordBase } from 'cm6-theme-nord';
+import { nord } from 'cm6-theme-nord';
 import { matchingCls, nonmatchingCls, actionSelector, panelsSelector, bgDark, } from './constants.js';
 const focused = '&.cm-focused', matching = `${focused} .${matchingCls}`, nonmatching = `${focused} .${nonmatchingCls}`;
 export const lightHighlightStyle = /* @__PURE__ */ (() => syntaxHighlighting(HighlightStyle.define(defaultHighlightStyle.specs, { themeType: 'light' })))();
@@ -36,6 +36,9 @@ export const light = /* @__PURE__ */ EditorView.theme({
     '.cm-doctag-type>*': {
         color: '#085',
     },
+    '.cm-doctag-var>*': {
+        color: '#00f',
+    },
     [matching]: {
         backgroundColor: 'rgb(50,140,130,.32)',
     },
@@ -48,8 +51,8 @@ export const light = /* @__PURE__ */ EditorView.theme({
  * @author Bhsd
  * @see https://zh.moegirl.org.cn/User:%E9%AC%BC%E5%BD%B1233/nord-moeskin.css
  */
-nord = /* @__PURE__ */ (() => [
-    nordBase,
+nordDark = /* @__PURE__ */ (() => [
+    nord,
     EditorView.theme({
         '&': {
             '--cm-arg': '#9f78a5',
@@ -81,6 +84,9 @@ nord = /* @__PURE__ */ (() => [
         '.cm-doctag-type>*': {
             color: '#ebcb8b',
         },
+        '.cm-doctag-var>*': {
+            color: '#8fbcbb',
+        },
         'div.cm-activeLine': {
             backgroundColor: 'rgb(76,86,106,.27)',
         },

package/dist/token.d.ts

@@ -21,21 +21,21 @@ declare interface Nesting extends Record<NestCount, number> {
 export interface State extends Nesting {
     readonly stack: Tokenizer[];
     readonly inHtmlTag: string[];
+    readonly dt: Partial<Nesting> & {
+        n: number;
+        html: number;
+    };
+    readonly data: MediaWikiData;
     tokenize: Tokenizer;
-    extMode: StreamParser<object> | false;
+    extMode: StreamParser<object> | boolean;
     lbrack: boolean | undefined;
     bold: boolean;
     italic: boolean;
-    dt: Partial<Nesting> & {
-        n: number;
-        html: number;
-    };
     sof: boolean;
     redirect: {
         colon: boolean;
     } | false;
     imgLink: boolean;
-    data: MediaWikiData;
 }
 declare type ExtState = Omit<State, 'dt'> & Partial<Pick<State, 'dt'>>;
 declare interface Token {
@@ -206,5 +206,9 @@ export declare class MediaWiki {
     'text/inputbox'(): StreamParser<State>;
     inGallery(section?: boolean): Tokenizer;
     'text/gallery'(tags: string[]): StreamParser<State>;
+    'text/math'(): StreamParser<object>;
+    json(): StreamParser<object>;
+    jsonc(): StreamParser<object>;
+    lilypond(): StreamParser<object>;
 }
 export {};

package/dist/token.js

@@ -43,6 +43,9 @@ import { getRegex } from '@bhsd/common';
 import { decodeHTML } from '@bhsd/browser';
 import { otherParserFunctions } from '@bhsd/cm-util';
 import { htmlTags, voidHtmlTags, selfClosingTags, tokenTable, tokens } from './config.js';
+import { jsonBasic, jsonc } from './json.js';
+import { math } from './math.js';
+import { lilypond } from './lilypond.js';
 class MediaWikiData {
     constructor(tags, urlProtocols) {
         this.tags = tags.includes('translate') ? tags.filter(tag => tag !== 'tvar') : tags;
@@ -119,7 +122,10 @@ const copyState = (state) => {
             result[key] = [...val];
         }
         else if (key === 'extState') {
-            result[key] = (state.extName && state.extMode && state.extMode.copyState || copyState)(val);
+            const f = state.extName && typeof state.extMode !== 'boolean'
+                && state.extMode.copyState?.bind(state.extMode)
+                || copyState;
+            result[key] = f(val);
         }
         else if (key !== 'data' && key !== 'extMode' && val && typeof val === 'object') {
             // @ts-expect-error initial value
@@ -330,7 +336,7 @@ const peekSpace = (stream, sol) => {
     const peek = stream.peek();
     return Boolean(peek && !peek.trim());
 };
-const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunctions = new Set([
+const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre', 'score']), pageFunctions = new Set([
     'raw',
     'msg',
     'filepath',
@@ -342,7 +348,7 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     'canonicalurle',
     'int',
     'msgnw',
-]), substs = new Set(['subst', 'safesubst']), headerRegex = new RegExp(String.raw `^(?:[^&[<{~'\-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(String.raw `^(?:[^|[&:}{<~'_＿\-]|${lookahead("}{<~'_＿-")})+`, 'iu'), styleRegex = new RegExp(String.raw `^(?:[^|[&}{<~'_＿\-]|${lookahead("}{<~'_＿-")})+`, 'iu'), wikiRegex = new RegExp(String.raw `^(?:[^&:'{[<~_＿\-]|${lookahead("'{[<~_＿-")})+`, 'iu'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${lookahead('{<')})+`, 'iu'), tableCellRegex = /^\s*(?:[|!]|\{\{\s*![!)\-+]?\s*\}\})/u, extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_＿{-", htmlAttrChars = '{/', freeRegex = [false, true].map(lpar => {
+]), substs = new Set(['subst', 'safesubst']), extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_＿{-", htmlAttrChars = '{/', tableDefinitionLookAhead = lookahead(tableDefinitionChars), htmlAttrLookAhead = lookahead(htmlAttrChars), tableCellLookAhead = lookahead(tableCellChars), argumentLookAhead = lookahead("}{<~'_＿-"), headerRegex = new RegExp(String.raw `^(?:[^&[<{~'\-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(String.raw `^(?:[^|[&:}{<~'_＿\-]|${argumentLookAhead})+`, 'iu'), styleRegex = new RegExp(String.raw `^(?:[^|[&}{<~'_＿\-]|${argumentLookAhead})+`, 'iu'), wikiRegex = new RegExp(String.raw `^(?:[^&:'{[<~_＿\-]|${lookahead("'{[<~_＿-")})+`, 'iu'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${tableDefinitionLookAhead})+`, 'iu'), tableCellRegex = /^\s*(?:[|!]|\{\{\s*![!)\-+]?\s*\}\})/u, freeRegex = [false, true].map(lpar => {
     const punctuations = getPunctuations(lpar), source = getUrlRegex(punctuations);
     return new RegExp(`^(?:${source}|[${punctuations}]+(?=${source}))*`, 'u');
 }), indentedTableRegex = [false, true].map(isTemplate => new RegExp(String.raw `^:*\s*(?=\{${getPipe(isTemplate)})`, 'u')), tableRegex = [false, true]
@@ -353,10 +359,10 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     new RegExp(String.raw `^(?:[<>{}]|%(?:3[ce]|[57][bd])|${lookahead('[]')})+`, 'iu'),
     new RegExp(String.raw `^(?:\}|${lookahead('[]{')})+`, 'u'),
     new RegExp(String.raw `^(?:[>}]|%(?:3[ce]|[57][bd])|${lookahead('[]{<')})+`, 'iu'),
-], tableDefinitionValueRegex = ['', '='].map(equal => new RegExp(String.raw `^(?:[^\s&${tableDefinitionChars}${equal}]|${lookahead(tableDefinitionChars)})+`, 'iu')), variableRegex = [false, true].map(isDefault => new RegExp(String.raw `^(?:[^|{}<${isDefault ? String.raw `[&~'_＿:\-` : ''}]|\}(?!\}\})|${isDefault ? lookahead("{<~'_＿-") : lookahead('{<', true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${escapeCharClass(chars)}]|${lookahead(chars)})+`, 'iu'))), doubleUnderscoreRegex = {
+], tableDefinitionValueRegex = ['', '='].map(equal => new RegExp(String.raw `^(?:[^\s&${tableDefinitionChars}${equal}]|${tableDefinitionLookAhead})+`, 'iu')), variableRegex = [false, true].map(isDefault => new RegExp(String.raw `^(?:[^|{}<${isDefault ? String.raw `[&~'_＿:\-` : ''}]|\}(?!\}\})|${isDefault ? tableCellLookAhead : lookahead(tableDefinitionChars, true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${escapeCharClass(chars)}]|${lookahead(chars)})+`, 'iu'))), doubleUnderscoreRegex = {
     _: /^[\p{L}\p{N}_]+?__/u,
     '＿': /^[\p{L}\p{N}_＿]+?＿{2}/u,
-}, getExtLinkTextRegex = getRegex(pipe => new RegExp(String.raw `^(?:[^\]&${pipe}${escapeCharClass(extLinkChars)}]|${lookahead(extLinkChars)})+`, 'iu')), getExtLinkRegex = getRegex(pipe => new RegExp(`^(?:${getUrlRegex(pipe)})+`, 'u')), getTableDefinitionRegex = getRegex(s => new RegExp(`^(?:[^&${tableDefinitionChars}${s}]|${lookahead(tableDefinitionChars)})+`, 'iu')), getTableCellRegex = getRegex(s => new RegExp(`^(?:[^[&${s}${escapeCharClass(tableCellChars)}]|${lookahead(tableCellChars)})+`, 'iu')), getHtmlAttrRegex = getRegex(s => new RegExp(`^(?:[^<>&${htmlAttrChars}${s}]|${lookahead(htmlAttrChars)})+`, 'u')), getHtmlAttrKeyRegex = getRegex(pipe => new RegExp(`^(?:[^<>&={/${pipe}]|${lookahead('{/')})+`, 'u')), getExtAttrRegex = getRegex(s => new RegExp(`^(?:[^>/${s}]|${lookahead('/')})+`, 'u')), getExtTagCloseRegex = getRegex(name => name === 'onlyinclude'
+}, getExtLinkTextRegex = getRegex(pipe => new RegExp(String.raw `^(?:[^\]&${pipe}${escapeCharClass(extLinkChars)}]|${lookahead(extLinkChars)})+`, 'iu')), getExtLinkRegex = getRegex(pipe => new RegExp(`^(?:${getUrlRegex(pipe)})+`, 'u')), getTableDefinitionRegex = getRegex(s => new RegExp(`^(?:[^&${tableDefinitionChars}${s}]|${tableDefinitionLookAhead})+`, 'iu')), getTableCellRegex = getRegex(s => new RegExp(`^(?:[^[&${s}${escapeCharClass(tableCellChars)}]|${tableCellLookAhead})+`, 'iu')), getHtmlAttrRegex = getRegex(s => new RegExp(`^(?:[^<>&${htmlAttrChars}${s}]|${htmlAttrLookAhead})+`, 'u')), getHtmlAttrKeyRegex = getRegex(pipe => new RegExp(`^(?:[^<>&={/${pipe}]|${htmlAttrLookAhead})+`, 'u')), getExtAttrRegex = getRegex(s => new RegExp(`^(?:[^>/${s}]|${lookahead('/')})+`, 'u')), getExtTagCloseRegex = getRegex(name => name === 'onlyinclude'
     ? /<\/onlyinclude(?:>|$)/u
     : new RegExp(String.raw `</${name}\s*(?:>|$)`, 'iu')), getNestedRegex = getRegex(tag => new RegExp(String.raw `^(?:[^<]|<(?!${tag}(?:[\s/>]|$)))+`, 'iu'));
 /** Adapted from the original CodeMirror 5 stream parser by Pavel Astakhov */
@@ -482,7 +488,7 @@ let MediaWiki = (() => {
                 .join('|')}))|\d+\s*(?:${spImgKeys.filter(word => img[word] !== 'img_width').map(word => word.slice(2))
                 .join('|')}))\s*(?=\||\]\]|$))`, 'u');
             this.tags = [...Object.keys(tags), 'includeonly', 'noinclude', 'onlyinclude'];
-            this.convertRegex = new RegExp(String.raw `^(?:[^}|;&='{[<~_＿\-]|\}(?!-)|=(?!>)|\[(?!\[|${urlProtocols})|${lookahead("'{<~_＿-")})+`, 'iu');
+            this.convertRegex = new RegExp(String.raw `^(?:[^}|;&='{[<~_＿\-]|\}(?!-)|=(?!>)|\[(?!\[|${urlProtocols})|${tableCellLookAhead})+`, 'iu');
             this.convertSemicolon = variants && new RegExp(String.raw `^;\s*(?=(?:[^;]*?=>\s*)?(?:${variants.join('|')})\s*:|(?:$|\}-))`, 'iu');
             this.convertLang = variants
                 && new RegExp(String.raw `^(?:=>\s*)?(?:${variants.join('|')})\s*:`, 'iu');
@@ -559,6 +565,9 @@ let MediaWiki = (() => {
             }
             for (const tag of this.tags) {
                 this.addToken(`tag-${tag}`, tag !== 'nowiki' && tag !== 'pre' && tag !== 'ref');
+                if (tag === 'score') {
+                    this.addToken('tag-score-scheme');
+                }
                 this.addToken(`ext-${tag}`, true);
             }
             for (const tag of this.permittedHtmlTags) {
@@ -1229,7 +1238,7 @@ let MediaWiki = (() => {
                 }
                 const t = state.stack[0], pipe = (['inTemplateArgument', 'inParserFunctionArgument', 'inVariable'].includes(t.name) ? '|' : '')
                     + getEqual(t);
-                if (pipe.includes(stream.peek() ?? '')) {
+                if (pipe.includes(stream.peek() || '')) {
                     pop(state);
                     return '';
                 }
@@ -1266,12 +1275,17 @@ let MediaWiki = (() => {
             const advance = (stream, state, re) => {
                 const mt = stream.match(re);
                 if (isLang) {
-                    let lang = mt[0].trim().toLowerCase();
-                    if (lang === 'js') {
-                        lang = 'javascript';
+                    if (name !== 'score') {
+                        let lang = mt[0].trim().toLowerCase();
+                        if (lang === 'wiki' || lang === 'wikitext') {
+                            lang = 'mediawiki';
+                        }
+                        if (lang in this.config.tagModes && lang in this) {
+                            state.extMode = this[lang]();
+                        }
                     }
-                    if (lang in this) {
-                        state.extMode = this[lang]();
+                    else if (mt[0].trim() === 'ABC') {
+                        state.extMode = true;
                     }
                 }
                 return makeLocalStyle(tokens.extTagAttributeValue + (isPage ? ` ${tokens.pageName}` : ''), state);
@@ -1294,7 +1308,7 @@ let MediaWiki = (() => {
                             ...state.data.tags.filter(tag => tag !== name),
                             ...name === 'translate' ? ['tvar'] : [],
                         ]);
-                    if (state.extMode) {
+                    if (typeof state.extMode !== 'boolean') {
                         state.extState = state.extMode.startState(0);
                     }
                     state.tokenize = this.eatExtTagArea(name);
@@ -1349,7 +1363,7 @@ let MediaWiki = (() => {
         inExtTokens(origString) {
             return (stream, state) => {
                 let ret;
-                if (state.extMode === false) {
+                if (typeof state.extMode === 'boolean') {
                     ret = `mw-tag-${state.extName} ${tokens.extTag}`;
                     stream.skipToEnd();
                 }
@@ -1709,7 +1723,7 @@ let MediaWiki = (() => {
             };
         }
         eatEntity(stream, style) {
-            const entity = stream.match(/^(?:#x[a-f\d]+|#\d+|[a-z\d]+);/iu);
+            const entity = stream.match(/^(?:#x[a-f\d]+|#\d+|[a-z][a-z\d]*);/iu);
             return entity && isHtmlEntity(entity[0]) ? tokens.htmlEntity : style;
         }
         /**
@@ -1745,7 +1759,7 @@ let MediaWiki = (() => {
                                 state[key] = other[key];
                             }
                         }
-                        if (!(state.extName && state.extMode)
+                        if (!(state.extName && typeof state.extMode !== 'boolean')
                             && state.nLink === 0
                             && typeof style === 'string'
                             && style.includes(tokens.apostrophes)) {
@@ -1868,15 +1882,21 @@ let MediaWiki = (() => {
                     return '';
                 },
                 blankLine(state) {
-                    if (state.extName && state.extMode && state.extMode.blankLine) {
+                    if (state.extName && typeof state.extMode !== 'boolean' && state.extMode.blankLine) {
                         state.extMode.blankLine(state.extState, 0);
                     }
                 },
                 indent(state, textAfter, context) {
-                    return state.extName && state.extMode && state.extMode.indent
+                    return state.extName && typeof state.extMode !== 'boolean' && state.extMode.indent
                         ? state.extMode.indent(state.extState, textAfter, context)
                         : null;
                 },
+                languageData: {
+                    closeBrackets: {
+                        brackets: ['(', '[', '{', '"'],
+                        before: ')]}>',
+                    },
+                },
                 ...tags
                     ? undefined
                     : {
@@ -1978,8 +1998,10 @@ let MediaWiki = (() => {
                     chain(state, this.inComment);
                     return tokens.comment;
                 }
-                /** @todo braces should also be parsed */
-                stream.match(/^(?:[^<]|<(?!!--))+/u);
+                else if (stream.match(/^\{\{(?!\{)/u)) {
+                    return this.eatTransclusion(stream, state) ?? '';
+                }
+                stream.match(/^(?:[^<{]|<(?!!--)|\{(?!\{(?!\{)))+/u);
                 return '';
             };
         }
@@ -2021,6 +2043,18 @@ let MediaWiki = (() => {
                 },
             };
         }
+        'text/math'() {
+            return math;
+        }
+        json() {
+            return jsonBasic;
+        }
+        jsonc() {
+            return jsonc;
+        }
+        lilypond() {
+            return lilypond;
+        }
     };
 })();
 export { MediaWiki };

package/dist/util.d.ts

@@ -1,9 +1,14 @@
 import type { EditorView, TooltipView, Decoration } from '@codemirror/view';
 import type { Text, EditorState, SelectionRange, Range } from '@codemirror/state';
+import type { StringStream } from '@codemirror/language';
+import type { Completion } from '@codemirror/autocomplete';
 import type { SyntaxNode } from '@lezer/common';
 import type { Position } from 'vscode-languageserver-types';
 import type { ConfigGetter } from '@bhsd/browser';
-import type { DocRange } from './fold';
+export interface DocRange {
+    from: number;
+    to: number;
+}
 /**
  * 转义HTML字符串
  * @param text 原字符串
@@ -52,19 +57,46 @@ export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) =>
  * @param to 结束位置
  */
 export declare const pushDecoration: (decorations: Range<Decoration>[], decoration: Decoration, from: number | DocRange, to?: number) => void;
+export declare const toConfigGetter: (configGetter?: ConfigGetter, articlePath?: string) => ConfigGetter | undefined;
+/**
+ * Tokenizer for multiline comments
+ * @param parent 外层 Tokenizer
+ * @param end 注释结束标志
+ */
+export declare const inComment: <T extends {
+    tokenize(stream: StringStream, state: T): string;
+}>(parent: (stream: StringStream, state: T) => string, end: string) => (stream: StringStream, state: T) => string;
+/**
+ * 生成自动补全选项
+ * @param labels 选项标签列表
+ * @param type 选项类型
+ */
+export declare const getCompletions: (labels: string[], type?: string) => Completion[];
+/**
+ * 从Token类型中获取扩展标签名
+ * @param types Token类型列表
+ */
+export declare const getExtTags: (types: string[]) => string[];
+/**
+ * 获取字符串开头的空白字符
+ * @param str 字符串
+ * @test
+ */
+export declare const leadingSpaces: (str: string) => string;
 /**
  * Mark the type in a JSDoc/LDoc comment
  * @param decorations
  * @param from 起始位置
  * @param mt 正则表达式匹配结果，第1个捕获组为标签，第2个捕获组为类型的起始括号`{`
+ * @param offset Decoration 向外扩展的大小，默认为0
  * @test
  */
-export declare const markDocTagType: (decorations: Range<Decoration>[], from: number, mt: RegExpExecArray) => Range<Decoration>[];
+export declare const markDocTagType: (decorations: Range<Decoration>[], from: number, mt: RegExpExecArray, offset?: number) => number;
 /**
  * Check if the node is a template parameter value
  * @param node 语法树节点
  */
-export declare const isTemplate: (node: SyntaxNode) => boolean;
+export declare const isTemplateParam: (node: SyntaxNode) => boolean;
 /**
  * Find the current template name and parameter name
  * @param state
@@ -72,10 +104,3 @@ export declare const isTemplate: (node: SyntaxNode) => boolean;
  * @test
  */
 export declare const findTemplateName: (state: EditorState, node: SyntaxNode) => [string | null, string];
-export declare const toConfigGetter: (configGetter?: ConfigGetter, articlePath?: string) => ConfigGetter | undefined;
-/**
- * 获取字符串开头的空白字符
- * @param str 字符串
- * @test
- */
-export declare const leadingSpaces: (str: string) => string;

package/dist/util.js

@@ -71,14 +71,51 @@ export const pushDecoration = (decorations, decoration, from, to) => {
         decorations.push(decoration.range(from, to));
     }
 };
+export const toConfigGetter = (configGetter, articlePath) => articlePath
+    ? async () => Object.assign(await (configGetter ?? wikiparse.getConfig)(), { articlePath })
+    : configGetter;
+/**
+ * Tokenizer for multiline comments
+ * @param parent 外层 Tokenizer
+ * @param end 注释结束标志
+ */
+export const inComment = (parent, end) => (stream, state) => {
+    if (stream.skipTo(end)) {
+        stream.next();
+        stream.next();
+        state.tokenize = parent;
+    }
+    else {
+        stream.skipToEnd();
+    }
+    return 'comment';
+};
+/**
+ * 生成自动补全选项
+ * @param labels 选项标签列表
+ * @param type 选项类型
+ */
+export const getCompletions = (labels, type = 'keyword') => labels.map((label) => ({ label, type }));
+/**
+ * 从Token类型中获取扩展标签名
+ * @param types Token类型列表
+ */
+export const getExtTags = (types) => types.filter(type => type.startsWith('mw-tag-')).map(type => type.slice(7));
+/**
+ * 获取字符串开头的空白字符
+ * @param str 字符串
+ * @test
+ */
+export const leadingSpaces = (str) => /^\s*/u.exec(str)[0];
 /**
  * Mark the type in a JSDoc/LDoc comment
  * @param decorations
  * @param from 起始位置
  * @param mt 正则表达式匹配结果，第1个捕获组为标签，第2个捕获组为类型的起始括号`{`
+ * @param offset Decoration 向外扩展的大小，默认为0
  * @test
  */
-export const markDocTagType = (decorations, from, mt) => {
+export const markDocTagType = (decorations, from, mt, offset = 0) => {
     const { input, indices } = mt, [start, end] = indices[1];
     pushDecoration(decorations, doctagMark, from + start, from + end);
     if (mt[2]) {
@@ -88,19 +125,19 @@ export const markDocTagType = (decorations, from, mt) => {
         while (m) {
             balance += m[0] === '{' ? 1 : -1;
             if (balance === 0) {
-                pushDecoration(decorations, typeMark, from + left, from + m.index);
-                break;
+                pushDecoration(decorations, typeMark, from + left - offset, from + m.index + offset);
+                return m.index + 1;
             }
             m = re.exec(input);
         }
     }
-    return decorations;
+    return end;
 };
 /**
  * Check if the node is a template parameter value
  * @param node 语法树节点
  */
-export const isTemplate = (node) => node.name.split('_').includes(tokens.template);
+export const isTemplateParam = (node) => node.name.split('_').includes(tokens.template);
 /**
  * Find the current template name and parameter name
  * @param state
@@ -109,7 +146,7 @@ export const isTemplate = (node) => node.name.split('_').includes(tokens.templat
  */
 export const findTemplateName = (state, node) => {
     let stack = -1, { prevSibling } = node, 
-    /** 可包含`_`、`:`等 */ page = '', parameter = '', need = isTemplate(node);
+    /** 可包含`_`、`:`等 */ page = '', parameter = '', need = isTemplateParam(node);
     while (prevSibling) {
         const { name } = prevSibling;
         if (name.includes(tokens.templateBracket)) {
@@ -149,12 +186,3 @@ export const findTemplateName = (state, node) => {
     }
     return [prevSibling && page, parameter];
 };
-export const toConfigGetter = (configGetter, articlePath) => articlePath
-    ? async () => Object.assign(await (configGetter ?? wikiparse.getConfig)(), { articlePath })
-    : configGetter;
-/**
- * 获取字符串开头的空白字符
- * @param str 字符串
- * @test
- */
-export const leadingSpaces = (str) => /^\s*/u.exec(str)[0];