@bhsd/codemirror-mediawiki 2.30.3 → 3.0.0

package/dist/mwConfig.js

@@ -1,4 +1,4 @@
-// ../code-standard/dist/index.mjs
+// ../browser/dist/index.js
 var CDN = "https://testingcf.jsdelivr.net";
 var getObject = (key) => JSON.parse(String(localStorage.getItem(key)));
 var setObject = (key, value) => {
@@ -10,7 +10,7 @@ var compareVersion = (version, baseVersion) => {
   return major > baseMajor || major === baseMajor && minor >= baseMinor;
 };
 
-// ../code-standard/dist/cm.mjs
+// ../cm-util/dist/index.mjs
 var otherParserFunctions = /* @__PURE__ */ new Set(["msg", "raw", "subst", "safesubst"]);
 var getConfig = (magicWords, rule, flip) => {
   const words = magicWords.filter(rule);
@@ -198,9 +198,6 @@ var getParserConfig2 = (minConfig, mwConfig) => {
     nsid,
     variants
   };
-  if (location.hostname.endsWith(".moegirl.org.cn")) {
-    config.html[2].push("img");
-  }
   const noCM = mw.loader.getState("ext.CodeMirror") === null;
   for (const [key, val] of Object.entries(insensitive)) {
     if (others.has(val) && val !== "msgnw") {

package/dist/ref.js

@@ -1,6 +1,6 @@
 import { hoverTooltip, EditorView } from '@codemirror/view';
 import { ensureSyntaxTree } from '@codemirror/language';
-import { getLSP } from '@bhsd/common';
+import { getLSP } from '@bhsd/browser';
 import { getTag } from './matchTag';
 import { tokens } from './config';
 import { indexToPos, posToIndex } from './hover';

package/dist/signature.js

@@ -1,6 +1,6 @@
 import { EditorView, showTooltip } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
-import { getLSP } from '@bhsd/common';
+import { getLSP } from '@bhsd/browser';
 import { indexToPos, createTooltipView } from './hover';
 const stateEffect = StateEffect.define(), field = StateField.define({
     create() {

package/dist/statusBar.d.ts

@@ -1,4 +1,4 @@
 import type { Extension } from '@codemirror/state';
-import type { LintSource } from './codemirror';
+import type { LintSource } from './lintsource';
 declare const _default: (fixer: LintSource["fixer"]) => Extension;
 export default _default;

package/dist/token.d.ts

@@ -5,7 +5,7 @@
  */
 import { Tag } from '@lezer/highlight';
 import { tokens } from './config';
-import type { MwConfig as MwConfigBase } from '@bhsd/common/dist/cm';
+import type { MwConfig as MwConfigBase } from '@bhsd/cm-util';
 import type { EditorState } from '@codemirror/state';
 import type { StreamParser, StringStream as StringStreamBase } from '@codemirror/language';
 import type { SyntaxNode } from '@lezer/common';
@@ -102,6 +102,7 @@ export declare class MediaWiki {
     readonly tags: string[];
     readonly hasVariants: boolean;
     readonly preRegex: [RegExp, RegExp];
+    readonly substRegex: RegExp;
     readonly autocompleteNamespaces: {
         0: string;
         6: string;
@@ -126,11 +127,11 @@ export declare class MediaWiki {
      * See makeLocalStyle() for how these tokens are used.
      */
     registerGroundTokens(): void;
-    inChars({ length }: string, tag: TagName): Tokenizer;
-    inStr(str: string, tag: TagName | false, errorTag?: TagName): Tokenizer;
+    inChars({ length }: string, tag: TagName): Tokenizer<string>;
+    inStr(str: string, tag: TagName | false, errorTag?: TagName): Tokenizer<string>;
     eatWikiText(style: string): Tokenizer;
     eatApostrophes(obj: Pick<State, 'bold' | 'italic'>): Tokenizer<string | false>;
-    eatExternalLinkProtocol({ length }: string, free?: boolean): Tokenizer;
+    eatExternalLinkProtocol({ length }: string, free?: boolean): Tokenizer<string>;
     inExternalLink(text?: boolean): Tokenizer;
     eatFreeExternalLink(this: void, stream: StringStream, state: State): Style;
     inLink(file: boolean, section?: boolean): Tokenizer;
@@ -138,22 +139,23 @@ export declare class MediaWiki {
     toEatImageParameter(stream: StringStream, state: State): void;
     eatList(stream: StringStream, state: State): string;
     eatDoubleUnderscore(style: string, stream: StringStream, state: State): Style;
-    get eatStartTable(): Tokenizer;
+    get eatStartTable(): Tokenizer<string>;
     inTableDefinition(tr?: boolean, quote?: string): Tokenizer;
     get inTable(): Tokenizer;
     inTableCell(style: string, needAttr?: boolean, firstLine?: boolean): Tokenizer;
     inSectionHeader(str: string): Tokenizer;
-    get inComment(): Tokenizer;
+    get inComment(): Tokenizer<string>;
     eatExtTag(tagname: string, isCloseTag: boolean, state: State): string;
     eatHtmlTag(tagname: string, isCloseTag: boolean, state: State): string;
-    eatTagName(name: string, isCloseTag?: boolean, isHtmlTag?: boolean): Tokenizer;
+    eatTagName(name: string, isCloseTag?: boolean, isHtmlTag?: boolean): Tokenizer<string>;
     inHtmlTagAttribute(name: string, quote?: string): Tokenizer;
-    inExtTagAttribute(name: string, quote?: string, isLang?: boolean, isPage?: boolean): Tokenizer;
-    eatExtTagArea(name: string): Tokenizer;
-    inExtTokens(origString: string): Tokenizer;
+    inExtTagAttribute(name: string, quote?: string, isLang?: boolean, isPage?: boolean): Tokenizer<string>;
+    eatExtTagArea(name: string): Tokenizer<string>;
+    inExtTokens(origString: string): Tokenizer<string>;
     inVariable(pos?: number): Tokenizer;
     eatTransclusion(stream: StringStream, state: State): string | undefined;
-    inParserFunctionName(invoke?: number, n?: number, ns?: number, subst?: boolean): Tokenizer;
+    inSubst(subst?: string): Tokenizer<string>;
+    inParserFunctionName(invoke?: number, n?: number, ns?: number): Tokenizer<string>;
     inTemplatePageName(haveEaten?: boolean, anchor?: boolean): Tokenizer;
     inParserFunctionArgument(module?: number, n?: number, ns?: number): Tokenizer;
     inTemplateArgument(expectName?: boolean, parserFunction?: boolean): Tokenizer;
@@ -180,7 +182,7 @@ export declare class MediaWiki {
     inGallery(section?: boolean): Tokenizer;
     'text/gallery'(tags: string[]): StreamParser<State>;
     javascript(): StreamParser<unknown>;
-    css(): StreamParser<unknown>;
     json(): StreamParser<unknown>;
+    lua(): StreamParser<unknown>;
 }
 export {};

package/dist/token.js

@@ -38,10 +38,11 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     done = true;
 };
 import { Tag } from '@lezer/highlight';
-import { decodeHTML, getRegex } from '@bhsd/common';
-import { otherParserFunctions } from '@bhsd/common/dist/cm';
-import { css } from '@codemirror/legacy-modes/mode/css';
+import { getRegex } from '@bhsd/common';
+import { decodeHTML } from '@bhsd/browser';
+import { otherParserFunctions } from '@bhsd/cm-util';
 import { javascript, json } from '@codemirror/legacy-modes/mode/javascript';
+import { lua } from '@codemirror/legacy-modes/mode/lua';
 import { htmlTags, voidHtmlTags, selfClosingTags, tokenTable, tokens } from './config';
 class MediaWikiData {
     constructor(tags) {
@@ -136,11 +137,11 @@ typeof document !== 'object' || str.startsWith('#') || [...decodeHTML(`&${str}`)
 /**
  * 更新内部 Tokenizer
  * @param state
- * @param tokenizer
+ * @param tokenizers
  */
-const chain = (state, tokenizer) => {
-    state.stack.unshift(state.tokenize);
-    state.tokenize = tokenizer;
+const chain = (state, ...tokenizers) => {
+    state.stack.unshift(...tokenizers.slice(1), state.tokenize);
+    state.tokenize = tokenizers[0];
 };
 /**
  * 更新内部 Tokenizer
@@ -192,7 +193,7 @@ const needColon = (state) => {
     return Boolean(dt.n) && dt.html === 0 && !state.bold && !state.italic && cmpNesting(dt, state, true);
 };
 /**
- * 获取外部链接正则表达式
+ * 获取外部链接正则表达式，注意`<`和`>`大小写敏感
  * @param punctuations 标点符号
  */
 const getUrlRegex = (punctuations = '') => {
@@ -319,8 +320,6 @@ const peekSpace = (stream, sol) => {
     return Boolean(peek && !peek.trim());
 };
 const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunctions = new Set([
-    'subst',
-    'safesubst',
     'raw',
     'msg',
     'filepath',
@@ -332,7 +331,7 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     'canonicalurle',
     'int',
     'msgnw',
-]), headerRegex = new RegExp(`^(?:[^&[<{~'-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(`^(?:[^|[&:}{<~'_-]|${lookahead("}{<~'_-")})+`, 'iu'), styleRegex = new RegExp(`^(?:[^|[&}{<~'_-]|${lookahead("}{<~'_-")})+`, 'iu'), wikiRegex = new RegExp(`^(?:[^&'{[<~_:-]|${lookahead("'{[<~_-")})+`, 'u'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${lookahead('{<')})+`, 'iu'), extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_{-", htmlAttrChars = '{/', freeRegex = [false, true].map(lpar => {
+]), substs = new Set(['subst', 'safesubst']), headerRegex = new RegExp(`^(?:[^&[<{~'-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(`^(?:[^|[&:}{<~'_-]|${lookahead("}{<~'_-")})+`, 'iu'), styleRegex = new RegExp(`^(?:[^|[&}{<~'_-]|${lookahead("}{<~'_-")})+`, 'iu'), wikiRegex = new RegExp(`^(?:[^&'{[<~_:-]|${lookahead("'{[<~_-")})+`, 'iu'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${lookahead('{<')})+`, 'iu'), tableCellRegex = /^\s*(?:[|!]|\{\{\s*![!)+-]?\s*\}\})/u, extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_{-", htmlAttrChars = '{/', 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]
@@ -369,6 +368,7 @@ let MediaWiki = (() => {
     let _eatExtTagArea_decorators;
     let _inExtTokens_decorators;
     let _inVariable_decorators;
+    let _inSubst_decorators;
     let _inParserFunctionName_decorators;
     let _inTemplatePageName_decorators;
     let _inParserFunctionArgument_decorators;
@@ -381,33 +381,40 @@ let MediaWiki = (() => {
     return class MediaWiki {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _inChars_decorators = [getTokenizer];
-            _inStr_decorators = [getTokenizer];
+            _inChars_decorators = [(getTokenizer)
+                // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+            ];
+            _inStr_decorators = [(getTokenizer)
+                // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+            ];
             _eatWikiText_decorators = [getTokenizer];
             _eatApostrophes_decorators = [getTokenizer];
-            _eatExternalLinkProtocol_decorators = [getTokenizer];
+            _eatExternalLinkProtocol_decorators = [(getTokenizer)];
             _inExternalLink_decorators = [getTokenizer];
             _inLink_decorators = [getTokenizer];
             _inLinkText_decorators = [getTokenizer];
-            _get_eatStartTable_decorators = [getTokenizer];
+            _get_eatStartTable_decorators = [(getTokenizer)];
             _inTableDefinition_decorators = [getTokenizer];
             _get_inTable_decorators = [getTokenizer];
             _inTableCell_decorators = [getTokenizer];
             _inSectionHeader_decorators = [getTokenizer];
-            _get_inComment_decorators = [getTokenizer];
-            _eatTagName_decorators = [getTokenizer];
+            _get_inComment_decorators = [(getTokenizer)];
+            _eatTagName_decorators = [(getTokenizer)];
             _inHtmlTagAttribute_decorators = [getTokenizer];
-            _inExtTagAttribute_decorators = [getTokenizer];
-            _eatExtTagArea_decorators = [getTokenizer];
-            _inExtTokens_decorators = [getTokenizer];
+            _inExtTagAttribute_decorators = [(getTokenizer)];
+            _eatExtTagArea_decorators = [(getTokenizer)];
+            _inExtTokens_decorators = [(getTokenizer)
+                // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+            ];
             _inVariable_decorators = [getTokenizer];
-            _inParserFunctionName_decorators = [getTokenizer];
+            _inSubst_decorators = [(getTokenizer)];
+            _inParserFunctionName_decorators = [(getTokenizer)];
             _inTemplatePageName_decorators = [getTokenizer];
             _inParserFunctionArgument_decorators = [getTokenizer];
             _inTemplateArgument_decorators = [getTokenizer];
             _inConvert_decorators = [getTokenizer];
-            _inPre_decorators = [getTokenizer];
-            _inNested_decorators = [getTokenizer];
+            _inPre_decorators = [(getTokenizer)];
+            _inNested_decorators = [(getTokenizer)];
             _get_inInputbox_decorators = [(getTokenizer)];
             _inGallery_decorators = [getTokenizer];
             __esDecorate(this, null, _inChars_decorators, { kind: "method", name: "inChars", static: false, private: false, access: { has: obj => "inChars" in obj, get: obj => obj.inChars }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -430,6 +437,7 @@ let MediaWiki = (() => {
             __esDecorate(this, null, _eatExtTagArea_decorators, { kind: "method", name: "eatExtTagArea", static: false, private: false, access: { has: obj => "eatExtTagArea" in obj, get: obj => obj.eatExtTagArea }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _inExtTokens_decorators, { kind: "method", name: "inExtTokens", static: false, private: false, access: { has: obj => "inExtTokens" in obj, get: obj => obj.inExtTokens }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _inVariable_decorators, { kind: "method", name: "inVariable", static: false, private: false, access: { has: obj => "inVariable" in obj, get: obj => obj.inVariable }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _inSubst_decorators, { kind: "method", name: "inSubst", static: false, private: false, access: { has: obj => "inSubst" in obj, get: obj => obj.inSubst }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _inParserFunctionName_decorators, { kind: "method", name: "inParserFunctionName", static: false, private: false, access: { has: obj => "inParserFunctionName" in obj, get: obj => obj.inParserFunctionName }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _inTemplatePageName_decorators, { kind: "method", name: "inTemplatePageName", static: false, private: false, access: { has: obj => "inTemplatePageName" in obj, get: obj => obj.inTemplatePageName }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _inParserFunctionArgument_decorators, { kind: "method", name: "inParserFunctionArgument", static: false, private: false, access: { has: obj => "inParserFunctionArgument" in obj, get: obj => obj.inParserFunctionArgument }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -443,7 +451,7 @@ let MediaWiki = (() => {
         }
         constructor(config) {
             __runInitializers(this, _instanceExtraInitializers);
-            const { urlProtocols, permittedHtmlTags, implicitlyClosedHtmlTags, tags, nsid, variants, redirection = ['#REDIRECT'], img = {}, } = config;
+            const { urlProtocols, permittedHtmlTags, implicitlyClosedHtmlTags, tags, nsid, variants, functionSynonyms: [insensitive], redirection = ['#REDIRECT'], img = {}, } = config;
             this.config = config;
             this.tokenTable = { ...tokenTable };
             this.hiddenTable = {};
@@ -463,12 +471,15 @@ let MediaWiki = (() => {
             this.imgRegex = new RegExp(String.raw `^(?:${this.img.filter(word => word.endsWith('$1')).map(word => word.slice(0, -2))
                 .join('|')}|(?:${this.img.filter(word => !word.endsWith('$1')).join('|')}|(?:\d+x?|\d*x\d+)\s*(?:px)?px)\s*(?=\||\]\]|$))`, 'u');
             this.tags = [...Object.keys(tags), 'includeonly', 'noinclude', 'onlyinclude'];
-            this.convertRegex = new RegExp(String.raw `^(?:[^}|;&='{[<~_-]|\}(?!-)|=(?!>)|\[(?!\[|${urlProtocols})|${lookahead("'{<~_-")})+`, 'u');
-            this.convertSemicolon = variants && new RegExp(String.raw `^;\s*(?=(?:[^;]*?=>\s*)?(?:${variants.join('|')})\s*:|(?:$|\}-))`, 'u');
+            this.convertRegex = new RegExp(String.raw `^(?:[^}|;&='{[<~_-]|\}(?!-)|=(?!>)|\[(?!\[|${urlProtocols})|${lookahead("'{<~_-")})+`, '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*:`, 'u');
+                && new RegExp(String.raw `^(?:=>\s*)?(?:${variants.join('|')})\s*:`, 'iu');
             this.hasVariants = Boolean(variants?.length);
             this.preRegex = [false, true].map(begin => new RegExp(String.raw `^(?:[^<&-]|-${this.hasVariants ? String.raw `(?!\{)` : ''}|<(?!${begin ? '/' : ''}nowiki>))+`, 'iu'));
+            this.substRegex = new RegExp(String.raw `^\s*(?:(${Object.entries(insensitive).filter(([, v]) => substs.has(v))
+                .map(([k]) => k + (k.endsWith('：') ? '' : ':'))
+                .join('|')})\s*)?`, 'iu');
             this.autocompleteNamespaces = {
                 0: '',
                 6: 'File:',
@@ -908,7 +919,11 @@ let MediaWiki = (() => {
             const linkState = { bold: false, italic: false }, regex = linkTextRegex[file ? 1 : 0];
             return (stream, state) => {
                 const tmpstyle = `${tokens[file ? 'fileText' : 'linkText']} ${linkState.bold ? tokens.strong : ''} ${linkState.italic ? tokens.em : ''} ${file && state.imgLink ? tokens.pageName : ''}`, { redirect, lbrack } = state, closing = stream.match(']]');
-                if (closing || !file && stream.match('[[', false)) {
+                if (closing
+                    || !file && stream.match('[[', false)
+                    || !gallery
+                        && state.stack[0]?.name === 'inTableCell'
+                        && stream.sol() && stream.match(tableCellRegex, false)) {
                     if (gallery) {
                         return makeStyle(tmpstyle, state);
                     }
@@ -1067,7 +1082,7 @@ let MediaWiki = (() => {
         inTableCell(style, needAttr = true, firstLine = true) {
             return (stream, state) => {
                 if (stream.sol()) {
-                    if (stream.match(/^\s*(?:[|!]|\{\{\s*![!)+-]?\s*\}\})/u, false)) {
+                    if (stream.match(tableCellRegex, false)) {
                         state.tokenize = this.inTable;
                         return '';
                     }
@@ -1234,23 +1249,23 @@ let MediaWiki = (() => {
             const advance = (stream, state, re) => {
                 const mt = stream.match(re);
                 if (isLang) {
-                    switch (mt[0].trim().toLowerCase()) {
-                        case 'js':
-                        case 'javascript':
-                            state.extMode = javascript;
-                            break;
-                        case 'css':
-                            state.extMode = css;
-                            break;
-                        case 'json':
-                            state.extMode = json;
-                        // no default
+                    let lang = mt[0].trim().toLowerCase();
+                    if (lang === 'js') {
+                        lang = 'javascript';
+                    }
+                    if (lang in this) {
+                        state.extMode = this[lang]();
                     }
                 }
                 return makeLocalStyle(tokens.extTagAttributeValue + (isPage ? ` ${tokens.pageName}` : ''), state);
             };
             return (stream, state) => {
-                if (stream.eat('>')) {
+                if (stream.match('/>')) {
+                    state.extMode = false;
+                    pop(state);
+                    return makeLocalTagStyle('extTagBracket', state);
+                }
+                else if (stream.eat('>')) {
                     const { config: { tagModes } } = this;
                     state.extName = name;
                     state.extMode ||= name in tagModes
@@ -1261,11 +1276,6 @@ let MediaWiki = (() => {
                     state.tokenize = this.eatExtTagArea(name);
                     return makeLocalTagStyle('extTagBracket', state);
                 }
-                else if (stream.match('/>')) {
-                    state.extMode = false;
-                    pop(state);
-                    return makeLocalTagStyle('extTagBracket', state);
-                }
                 else if (quote) { // 有引号的属性值
                     if (stream.eat(quote[0])) {
                         const [, remains] = quote;
@@ -1372,12 +1382,12 @@ let MediaWiki = (() => {
             };
         }
         eatTransclusion(stream, state) {
-            const [{ length }] = stream.match(/^\s*/u);
+            const [{ length }, subst] = stream.match(this.substRegex), tokenizers = subst ? [this.inSubst(subst)] : [];
             // Parser function
             if (stream.peek() === '#') {
                 stream.backUp(length);
                 state.nExt++;
-                chain(state, this.inParserFunctionName());
+                chain(state, ...tokenizers, this.inParserFunctionName());
                 return makeLocalTagStyle('parserFunctionBracket', state);
             }
             // Check for parser function without '#'
@@ -1397,13 +1407,14 @@ let MediaWiki = (() => {
                         && functionSynonyms[0][ffLower];
                 if ((!delimiter || fullWidth || delimiter === ':' || delimiter === '}')
                     && canonicalName
+                    && !substs.has(canonicalName)
                     && (fullWidth || delimiter === ':' || !variableIDs || variableIDs.includes(canonicalName))
                     && (!fullWidth && delimiter !== ':'
                         || !functionHooks
                         || functionHooks.includes(canonicalName) || otherParserFunctions.has(canonicalName))) {
                     stream.backUp(length);
                     state.nExt++;
-                    chain(state, this.inParserFunctionName());
+                    chain(state, ...tokenizers, this.inParserFunctionName());
                     return makeLocalTagStyle('parserFunctionBracket', state);
                 }
             }
@@ -1413,10 +1424,24 @@ let MediaWiki = (() => {
             // Template
             stream.backUp(length);
             state.nTemplate++;
-            chain(state, this.inTemplatePageName());
+            chain(state, ...tokenizers, this.inTemplatePageName());
             return makeLocalTagStyle('templateBracket', state);
         }
-        inParserFunctionName(invoke, n, ns, subst) {
+        inSubst(subst) {
+            return (stream, state) => {
+                if (subst) {
+                    stream.eatSpace();
+                    stream.match(subst);
+                    stream.backUp(1);
+                    state.tokenize = this.inSubst();
+                    return makeLocalTagStyle('parserFunctionName', state);
+                }
+                stream.next();
+                pop(state);
+                return makeLocalTagStyle('parserFunctionDelimiter', state);
+            };
+        }
+        inParserFunctionName(invoke, n, ns) {
             return (stream, state) => {
                 const sol = stream.sol(), space = stream.eatSpace();
                 if (stream.eol()) {
@@ -1438,9 +1463,7 @@ let MediaWiki = (() => {
                 }
                 const ch = stream.eat(/[:：|]/u);
                 if (ch) {
-                    state.tokenize = subst && stream.match(/^\s*#/u, false)
-                        ? this.inParserFunctionName()
-                        : this.inParserFunctionArgument(invoke, n, ns);
+                    state.tokenize = this.inParserFunctionArgument(invoke, n, ns);
                     return makeLocalTagStyle(space || ch === '|' ? 'error' : 'parserFunctionDelimiter', state);
                 }
                 const mt = stream.match(/^(?:[^:：}{|<>[\]\s]|\s(?![:：]))+/u);
@@ -1485,9 +1508,7 @@ let MediaWiki = (() => {
                                     namespace = 10;
                                 // no default
                             }
-                            state.tokenize = canonicalName === 'subst' || canonicalName === 'safesubst'
-                                ? this.inParserFunctionName(invoke, n, ns, true)
-                                : this.inParserFunctionName(Infinity, Infinity, namespace);
+                            state.tokenize = this.inParserFunctionName(Infinity, Infinity, namespace);
                         }
                     }
                     return makeLocalTagStyle('parserFunctionName', state);
@@ -1637,8 +1658,8 @@ let MediaWiki = (() => {
                     return makeLocalTagStyle('convertBracket', state);
                 }
                 else if (needFlag && stream.match(/^[;\sa-z-]*(?=\|)/iu)) {
-                    chain(state, this.inConvert(style, false, true, plain));
-                    state.tokenize = this.inStr('|', 'convertDelimiter');
+                    state.tokenize = this.inConvert(style, false, true, plain);
+                    chain(state, this.inStr('|', 'convertDelimiter'));
                     return makeLocalTagStyle('convertFlag', state);
                 }
                 else if (stream.match(this.convertSemicolon)) {
@@ -1974,12 +1995,12 @@ let MediaWiki = (() => {
         javascript() {
             return javascript;
         }
-        css() {
-            return css;
-        }
         json() {
             return json;
         }
+        lua() {
+            return lua;
+        }
     };
 })();
 export { MediaWiki };

package/dist/vue.d.ts

@@ -0,0 +1,3 @@
+import { LanguageSupport } from '@codemirror/language';
+declare const _default: () => LanguageSupport;
+export default _default;

package/dist/vue.js

@@ -0,0 +1,14 @@
+import { vue } from '@codemirror/lang-vue';
+import { htmlLanguage, htmlCompletionSource } from '@codemirror/lang-html';
+import { javascript } from '@codemirror/lang-javascript';
+import { LanguageSupport } from '@codemirror/language';
+import { jsCompletion } from './javascript';
+import css from './css';
+export default () => vue({
+    base: new LanguageSupport(htmlLanguage, [
+        htmlLanguage.data.of({ autocomplete: htmlCompletionSource }),
+        javascript().support,
+        jsCompletion,
+        css(undefined).support,
+    ]),
+});