@bhsd/codemirror-mediawiki 3.5.0 → 3.5.2

package/dist/mwConfig.js

@@ -12,6 +12,14 @@ var compareVersion = (version, baseVersion) => {
 
 // ../cm-util/dist/index.mjs
 var otherParserFunctions = /* @__PURE__ */ new Set(["msg", "raw", "subst", "safesubst"]);
+var isUnderscore = (s) => !/^＿{2}.+＿{2}$/u.test(s);
+var cleanAliases = (aliases) => {
+  for (const key in aliases) {
+    if (/^[^#＃].*：$/u.test(key)) {
+      delete aliases[key];
+    }
+  }
+};
 var getConfig = (magicWords, rule, flip) => {
   const words = magicWords.filter(rule);
   return Object.fromEntries(
@@ -32,10 +40,12 @@ var getParserConfig = (minConfig, mwConfig) => {
     redirection
   } = mwConfig, [insensitive, sensitive] = functionSynonyms, behaviorSwitch = doubleUnderscore.map(
     (obj, i) => Object.entries(obj).map(([k, v]) => [
-      k.slice(2, -2),
+      isUnderscore(k) ? k.slice(2, -2) : k,
       i && typeof v === "string" ? v.toUpperCase() : v
     ])
   );
+  cleanAliases(insensitive);
+  cleanAliases(sensitive);
   for (const [k, v] of Object.entries(insensitive)) {
     if (k in sensitive) {
       delete insensitive[k];
@@ -48,7 +58,9 @@ var getParserConfig = (minConfig, mwConfig) => {
     ext: Object.keys(tags),
     parserFunction: [{ ...insensitive }, { ...sensitive, "=": "=" }, [], []],
     doubleUnderscore: [
-      ...behaviorSwitch.map((entries) => entries.map(([k]) => k)),
+      ...behaviorSwitch.map(
+        (entries) => entries.filter(([k]) => isUnderscore(k)).map(([k]) => k)
+      ),
       ...behaviorSwitch.map(Object.fromEntries)
     ],
     protocol: urlProtocols.replace(/\|\\?\/\\?\/$|\\(?=[:/])/gu, ""),
@@ -87,8 +99,12 @@ var getStaticMwConfig = ({
   tags: Object.fromEntries(ext.map((s) => [s, true])),
   tagModes: modes,
   doubleUnderscore: [
-    Object.fromEntries((d2 && d0.length === 0 ? Object.keys(d2) : d0).map((s) => [`__${s}__`, true])),
-    Object.fromEntries((d3 && d1.length === 0 ? Object.keys(d3) : d1).map((s) => [`__${s}__`, true]))
+    Object.fromEntries(
+      (d2 && d0.length === 0 ? Object.keys(d2) : d0).map((s) => [isUnderscore(s) ? `__${s}__` : s, true])
+    ),
+    Object.fromEntries(
+      (d3 && d1.length === 0 ? Object.keys(d3) : d1).map((s) => [isUnderscore(s) ? `__${s}__` : s, true])
+    )
   ],
   functionHooks: functionHook,
   variableIDs: variable,
@@ -152,6 +168,7 @@ var getMwConfig = async (modes) => {
     if (config && !isIPE) {
       const { functionSynonyms: [insensitive] } = config;
       if (!("subst" in insensitive)) {
+        cleanAliases(insensitive);
         Object.assign(insensitive, getConfig(magicwords, ({ name }) => others.has(name)));
       }
     } else {
@@ -169,6 +186,7 @@ var getMwConfig = async (modes) => {
         )
       };
     }
+    cleanAliases(config.functionSynonyms[1]);
     Object.assign(config, {
       ...getKeywords(magicwords, true),
       tagModes: modes,

package/dist/ref.js

@@ -1,6 +1,7 @@
 import { hoverTooltip, EditorView } from '@codemirror/view';
 import { ensureSyntaxTree } from '@codemirror/language';
 import { getLSP } from '@bhsd/browser';
+import elt from 'crelt';
 import { getTag } from './matchTag';
 import { tokens } from './config';
 import { indexToPos, posToIndex } from './hover';
@@ -49,8 +50,7 @@ export default (cm) => [
                             end: to,
                             above: true,
                             create() {
-                                const dom = document.createElement('div');
-                                dom.className = 'cm-tooltip-ref';
+                                const dom = elt('div', { class: 'cm-tooltip-ref' });
                                 dom.style.font = getComputedStyle(view.contentDOM).font;
                                 if (ref) {
                                     const { range: { start, end } } = ref[0], anchor = posToIndex(doc, start), head = posToIndex(doc, end);

package/dist/static.js

@@ -1,3 +1,4 @@
+import { isUnderscore } from '@bhsd/cm-util';
 export const tagModes = {
     onlyinclude: 'mediawiki',
     includeonly: 'mediawiki',
@@ -24,8 +25,8 @@ export const getStaticMwConfig = ({ variable, parserFunction: [p0, p1, ...p2], p
     tags: Object.fromEntries(ext.map(s => [s, true])),
     tagModes: modes,
     doubleUnderscore: [
-        Object.fromEntries((d2 && d0.length === 0 ? Object.keys(d2) : d0).map(s => [`__${s}__`, true])),
-        Object.fromEntries((d3 && d1.length === 0 ? Object.keys(d3) : d1).map(s => [`__${s}__`, true])),
+        Object.fromEntries((d2 && d0.length === 0 ? Object.keys(d2) : d0).map(s => [isUnderscore(s) ? `__${s}__` : s, true])),
+        Object.fromEntries((d3 && d1.length === 0 ? Object.keys(d3) : d1).map(s => [isUnderscore(s) ? `__${s}__` : s, true])),
     ],
     functionHooks: functionHook,
     variableIDs: variable,

package/dist/statusBar.js

@@ -1,14 +1,10 @@
 import { showPanel, EditorView } from '@codemirror/view';
 import { nextDiagnostic, setDiagnosticsEffect } from '@codemirror/lint';
+import elt from 'crelt';
 import { menuRegistry } from './codemirror';
-const optionAll = /* @__PURE__ */ (() => {
-    const ele = document.createElement('div');
-    ele.textContent = 'Fix all auto-fixable problems';
-    return ele;
-})();
+const optionAll = elt('div', 'Fix all auto-fixable problems');
 function getLintMarker(view, severity, menu) {
-    const marker = document.createElement('div'), icon = document.createElement('div');
-    marker.className = `cm-status-${severity}`;
+    const marker = elt('div', { class: `cm-status-${severity}` }), icon = elt('div');
     if (severity === 'fix') {
         icon.className = 'cm-status-fix-disabled';
         marker.title = 'Fix all';
@@ -27,9 +23,7 @@ function getLintMarker(view, severity, menu) {
     }
     else {
         icon.className = `cm-lint-marker-${severity}`;
-        const count = document.createElement('div');
-        count.textContent = '0';
-        marker.append(icon, count);
+        marker.append(icon, elt('div', '0'));
         marker.addEventListener('click', () => {
             if (marker.parentElement?.classList.contains('cm-status-worker-enabled')) {
                 nextDiagnostic(view);
@@ -57,10 +51,7 @@ const updateDiagnosticMessage = (cm, allDiagnostics, main, msg) => {
         msg.textContent = diagnostic.message;
         if (diagnostic.actions) {
             msg.append(...diagnostic.actions.map(({ name, apply }) => {
-                const button = document.createElement('button');
-                button.type = 'button';
-                button.className = 'cm-diagnosticAction';
-                button.textContent = name;
+                const button = elt('button', { type: 'button', class: 'cm-diagnosticAction' }, name);
                 button.addEventListener('click', e => {
                     e.preventDefault();
                     apply(view, diagnostic.from, diagnostic.to);
@@ -81,8 +72,7 @@ const updateMenu = (cm, allDiagnostics, main, classList, menu, fixer) => {
         }
         toggleClass(classList, true);
         const actions = actionable.flatMap(({ getItems }) => getItems(cm)), quickfix = [...fixable].map(rule => {
-            const option = document.createElement('div');
-            option.textContent = `Fix all ${rule} problems`;
+            const option = elt('div', `Fix all ${rule} problems`);
             option.dataset['rule'] = rule;
             return option;
         });
@@ -98,9 +88,7 @@ export default (cm, fixer) => [
     showPanel.of(view => {
         let diagnostics = [], menu;
         if (!view.state.readOnly && (fixer || menuRegistry.length > 0)) {
-            menu = document.createElement('div');
-            menu.className = 'cm-status-fix-menu';
-            menu.tabIndex = -1;
+            menu = elt('div', { class: 'cm-status-fix-menu', tabIndex: -1 });
             if (fixer) {
                 menu.addEventListener('click', ({ target }) => {
                     if (target === menu) {
@@ -122,14 +110,7 @@ export default (cm, fixer) => [
             });
             view.dom.append(menu);
         }
-        const dom = document.createElement('div'), worker = document.createElement('div'), message = document.createElement('div'), position = document.createElement('div'), error = getLintMarker(view, 'error'), warning = getLintMarker(view, 'warning'), fix = getLintMarker(view, 'fix', menu), { classList } = fix.firstChild;
-        worker.className = 'cm-status-worker';
-        worker.append(error, warning, fix);
-        message.className = 'cm-status-message';
-        position.className = 'cm-status-line';
-        position.textContent = '0:0';
-        dom.className = 'cm-panel cm-panel-status';
-        dom.append(worker, message, position);
+        const error = getLintMarker(view, 'error'), warning = getLintMarker(view, 'warning'), fix = getLintMarker(view, 'fix', menu), worker = elt('div', { class: 'cm-status-worker' }, error, warning, fix), message = elt('div', { class: 'cm-status-message' }), position = elt('div', { class: 'cm-status-line' }, '0:0'), dom = elt('div', { class: 'cm-panel cm-panel-status' }, worker, message, position), { classList } = fix.firstChild;
         return {
             dom,
             update({ state: { selection: { main }, doc }, transactions, docChanged, selectionSet }) {
@@ -236,5 +217,8 @@ export default (cm, fixer) => [
         '.cm-status-line': {
             whiteSpace: 'nowrap',
         },
+        '.cm-diagnosticText-clickable': {
+            cursor: 'pointer',
+        },
     }),
 ];

package/dist/token.d.ts

@@ -138,7 +138,7 @@ export declare class MediaWiki {
     inLinkText(file: boolean, gallery?: boolean): Tokenizer;
     toEatImageParameter(stream: StringStream, state: State): void;
     eatList(stream: StringStream, state: State): string;
-    eatDoubleUnderscore(style: string, stream: StringStream, state: State): Style;
+    eatDoubleUnderscore(style: string, ch: '_' | '＿', stream: StringStream, state: State): Style;
     get eatStartTable(): Tokenizer<string>;
     inTableDefinition(tr?: boolean, quote?: string): Tokenizer;
     get inTable(): Tokenizer;

package/dist/token.js

@@ -170,6 +170,7 @@ const lookahead = (chars, comment) => {
         '<': comment ? '<(?!!--)' : '<(?!!--|/?[a-z])',
         '~': '~~?(?!~)',
         _: '_(?!_)',
+        '＿': '＿(?!＿)',
         '[': String.raw `\[(?!\[)`,
         ']': String.raw `\](?!\])`,
         '/': '/(?!>)',
@@ -329,7 +330,7 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     'canonicalurle',
     'int',
     'msgnw',
-]), 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 => {
+]), 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]
@@ -340,7 +341,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 ? "[&~'_:-" : ''}]|\}(?!\}\})|${isDefault ? lookahead("{<~'_-") : lookahead('{<', true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${chars}]|${lookahead(chars)})+`, 'iu'))), getExtLinkTextRegex = getRegex(pipe => new RegExp(String.raw `^(?:[^\]&${pipe}${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}${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'
+], tableDefinitionValueRegex = ['', '='].map(equal => new RegExp(String.raw `^(?:[^\s&${tableDefinitionChars}${equal}]|${lookahead(tableDefinitionChars)})+`, 'iu')), variableRegex = [false, true].map(isDefault => new RegExp(String.raw `^(?:[^|{}<${isDefault ? "[&~'_＿:-" : ''}]|\}(?!\}\})|${isDefault ? lookahead("{<~'_＿-") : lookahead('{<', true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${chars}]|${lookahead(chars)})+`, 'iu'))), doubleUnderscoreRegex = {
+    _: /^[\p{L}\p{N}_]+?__/u,
+    '＿': /^[\p{L}\p{N}_＿]+?＿{2}/u,
+}, getExtLinkTextRegex = getRegex(pipe => new RegExp(String.raw `^(?:[^\]&${pipe}${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}${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'
     ? /<\/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 */
@@ -469,7 +473,7 @@ 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("'{<~_-")})+`, 'iu');
+            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*:`, 'iu');
@@ -706,14 +710,15 @@ let MediaWiki = (() => {
                         }
                         break;
                     }
-                    case '_': {
+                    case '_':
+                    case '＿': {
                         const { pos } = stream;
-                        stream.eatWhile('_');
+                        stream.eatWhile(ch);
                         switch (stream.pos - pos) {
                             case 0:
                                 break;
                             case 1:
-                                return this.eatDoubleUnderscore(style, stream, state);
+                                return this.eatDoubleUnderscore(style, ch, stream, state);
                             default:
                                 if (!stream.eol()) {
                                     stream.backUp(2);
@@ -768,13 +773,13 @@ let MediaWiki = (() => {
                     // no default
                 }
                 if (state.stack.length === 0) {
-                    if (ch !== '_') {
+                    if (ch !== '_' && ch !== '＿') {
                         // highlight free external links, bug T108448
                         if (/[\p{L}\p{N}]/u.test(ch)) {
                             stream.backUp(1);
                         }
                         else {
-                            stream.eatWhile(/[^\p{L}\p{N}_&'{[<~:-]/u);
+                            stream.eatWhile(/[^\p{L}\p{N}_＿&'{[<~:-]/u);
                         }
                         const mt = stream.match(this.urlProtocols, false);
                         if (mt) {
@@ -978,11 +983,11 @@ let MediaWiki = (() => {
             }
             return makeLocalTagStyle('list', state);
         }
-        eatDoubleUnderscore(style, stream, state) {
-            const { config: { doubleUnderscore } } = this, name = stream.match(/^[\p{L}\p{N}_]+?__/u);
+        eatDoubleUnderscore(style, ch, stream, state) {
+            const { config: { doubleUnderscore } } = this, underscore = ch.repeat(2), name = stream.match(doubleUnderscoreRegex[ch]);
             if (name) {
-                if (Object.prototype.hasOwnProperty.call(doubleUnderscore[0], `__${name[0].toLowerCase()}`)
-                    || Object.prototype.hasOwnProperty.call(doubleUnderscore[1], `__${name[0]}`)) {
+                if (Object.prototype.hasOwnProperty.call(doubleUnderscore[0], underscore + name[0].toLowerCase())
+                    || Object.prototype.hasOwnProperty.call(doubleUnderscore[1], underscore + name[0])) {
                     return tokens.doubleUnderscore;
                 }
                 else if (!stream.eol()) {
@@ -1583,7 +1588,7 @@ let MediaWiki = (() => {
             if (n === 0) {
                 return this.inTemplateArgument(true, true);
             }
-            const chars = n === 2 ? '}{<' : "}{<~'_-"; // `#invoke`/`#tag`
+            const chars = n === 2 ? '}{<' : "}{<~'_＿-"; // `#invoke`/`#tag`
             let style = `${tokens.parserFunction} ${module ? tokens.pageName : ''}`;
             switch (module) {
                 case 1: