@bhsd/codemirror-mediawiki 3.6.1 → 3.6.3

package/dist/statusBar.js

@@ -83,7 +83,6 @@ const updateMenu = (cm, allDiagnostics, main, classList, optionAll, menu, fixer)
         menu.replaceChildren(...actions, ...quickfix);
     }
 };
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export default (cm, fixer) => [
     showPanel.of(view => {
         let diagnostics = [], menu;

package/dist/theme.js

@@ -23,6 +23,7 @@ export const light = /* @__PURE__ */ EditorView.theme({
         '--cm-tpl': '#80c',
         '--cm-var': '#ad9300',
         '--cm-var-name': '#ac6600',
+        '--cm-ref': 'rgb(223,242,235,.5)',
     },
     [matching]: {
         backgroundColor: 'rgb(50,140,130,.32)',
@@ -71,6 +72,7 @@ nord = /* @__PURE__ */ (() => [
             '--cm-tpl': '#9f78a5',
             '--cm-var': '#d08770',
             '--cm-var-name': '#d08770',
+            '--cm-ref': 'rgb(60,90,80,0.5)',
         },
         'div.cm-activeLine': {
             backgroundColor: 'rgb(76,86,106,.27)',

package/dist/token.js

@@ -1,8 +1,3 @@
-/**
- * @author pastakhov, MusikAnimal, Bhsd and others
- * @license GPL-2.0-or-later
- * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
- */
 var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
     var useValue = arguments.length > 2;
     for (var i = 0; i < initializers.length; i++) {
@@ -37,6 +32,12 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
+/**
+ * @author pastakhov, MusikAnimal, Bhsd and others
+ * @license GPL-2.0-or-later
+ * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
+ */
+/* eslint-disable @typescript-eslint/class-methods-use-this */
 import { Tag } from '@lezer/highlight';
 import { getRegex } from '@bhsd/common';
 import { decodeHTML } from '@bhsd/browser';
@@ -120,7 +121,7 @@ const copyState = (state) => {
         }
         else if (key !== 'data' && val && typeof val === 'object') {
             // @ts-expect-error initial value
-            result[key] = { ...val }; // eslint-disable-line @typescript-eslint/no-misused-spread
+            result[key] = { ...val };
         }
     }
     return result;
@@ -129,9 +130,7 @@ const copyState = (state) => {
  * 判断字符串是否为 HTML 实体
  * @param str 字符串
  */
-const isHtmlEntity = (str) => 
-// eslint-disable-next-line @typescript-eslint/no-misused-spread
-typeof document !== 'object' || str.startsWith('#') || [...decodeHTML(`&${str}`)].length === 1;
+const isHtmlEntity = (str) => typeof document !== 'object' || str.startsWith('#') || [...decodeHTML(`&${str}`)].length === 1;
 /**
  * 更新内部 Tokenizer
  * @param state
@@ -180,7 +179,6 @@ const lookahead = (chars, comment) => {
         const { data: { tags } } = comment;
         table['<'] = String.raw `<(?!!--${tags.includes('onlyinclude') ? '|onlyinclude>' : ''}|(?:${tags.filter(tag => tag !== 'onlyinclude').join('|')})(?:[\s/>]|$))`;
     }
-    // eslint-disable-next-line @typescript-eslint/no-misused-spread
     return [...chars].map(ch => table[ch]).join('|');
 };
 /**
@@ -383,12 +381,8 @@ let MediaWiki = (() => {
     return class MediaWiki {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _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
-            ];
+            _inChars_decorators = [(getTokenizer)];
+            _inStr_decorators = [(getTokenizer)];
             _eatWikiText_decorators = [getTokenizer];
             _eatApostrophes_decorators = [getTokenizer];
             _eatExternalLinkProtocol_decorators = [(getTokenizer)];
@@ -405,9 +399,7 @@ let MediaWiki = (() => {
             _inHtmlTagAttribute_decorators = [getTokenizer];
             _inExtTagAttribute_decorators = [(getTokenizer)];
             _eatExtTagArea_decorators = [(getTokenizer)];
-            _inExtTokens_decorators = [(getTokenizer)
-                // eslint-disable-next-line @typescript-eslint/class-methods-use-this
-            ];
+            _inExtTokens_decorators = [(getTokenizer)];
             _inVariable_decorators = [getTokenizer];
             _inSubst_decorators = [(getTokenizer)];
             _inParserFunctionName_decorators = [(getTokenizer)];
@@ -501,7 +493,6 @@ let MediaWiki = (() => {
          * @param parent
          */
         addToken(token, hidden = false, parent) {
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             this[hidden ? 'hiddenTable' : 'tokenTable'][`mw-${token}`] ??= Tag.define(parent);
         }
         /**
@@ -550,13 +541,13 @@ let MediaWiki = (() => {
                 this.addToken(`section--${i}`);
             }
             for (const tag of this.tags) {
-                this.addToken(`tag-${tag}`, tag !== 'nowiki' && tag !== 'pre');
+                this.addToken(`tag-${tag}`, tag !== 'nowiki' && tag !== 'pre' && tag !== 'ref');
                 this.addToken(`ext-${tag}`, true);
             }
             for (const tag of this.permittedHtmlTags) {
                 this.addToken(`html-${tag}`, true);
             }
-            for (const i in this.autocompleteNamespaces) {
+            for (const i of Object.keys(this.autocompleteNamespaces)) {
                 if (Number.isInteger(Number(i))) {
                     this.addToken(`function-${i}`, true);
                 }
@@ -583,7 +574,7 @@ let MediaWiki = (() => {
         }
         eatWikiText(style) {
             if (style in tokens) {
-                style = tokens[style]; // eslint-disable-line no-param-reassign
+                style = tokens[style];
             }
             const regex = /^(?:(?:RFC|PMID)[\p{Zs}\t]+\d+|ISBN[\p{Zs}\t]+(?:97[89][\p{Zs}\t-]?)?(?:\d[\p{Zs}\t-]?){9}[\dxX])\b/u;
             return (stream, state) => {
@@ -661,7 +652,6 @@ let MediaWiki = (() => {
                                 }
                                 else if (ch === ' '
                                     && !/^ \s*(?=<!--)(?:\s|<!--(?:(?!-->).)*-->)+$/u.test(stream.string)) {
-                                    /** @todo indent-pre is sometimes suppressed */
                                     return tokens.skipFormatting;
                                 }
                             }
@@ -852,7 +842,6 @@ let MediaWiki = (() => {
                 return '';
             };
         }
-        // eslint-disable-next-line @typescript-eslint/class-methods-use-this
         eatFreeExternalLink(stream, state) {
             const mt = stream.match(freeRegex[0]);
             if (!stream.eol() && mt[0].includes('(') && getPunctuations().includes(stream.peek())) {
@@ -974,7 +963,6 @@ let MediaWiki = (() => {
                 chain(state, this.inChars(mt[0], 'imageParameter'));
             }
         }
-        // eslint-disable-next-line @typescript-eslint/class-methods-use-this
         eatList(stream, state) {
             const mt = stream.match(/^[*#;:]*/u), { dt } = state;
             if (mt[0].includes(';')) {
@@ -1165,8 +1153,8 @@ let MediaWiki = (() => {
                 if (dt.n && dt.html) {
                     dt.html--;
                 }
-                if (tagname === inHtmlTag[0]) {
-                    inHtmlTag.shift();
+                if (tagname === inHtmlTag[inHtmlTag.length - 1]) {
+                    inHtmlTag.pop();
                 }
                 else {
                     chain(state, this.inStr('>', 'error'));
@@ -1207,7 +1195,7 @@ let MediaWiki = (() => {
                 const mt = stream.match(/^\/?>/u);
                 if (mt) {
                     if (!this.voidHtmlTags.has(name) && (mt[0] === '>' || !selfClosingTags.includes(name))) {
-                        state.inHtmlTag.unshift(name);
+                        state.inHtmlTag.push(name);
                         state.dt.html++;
                     }
                     pop(state);
@@ -1696,7 +1684,6 @@ let MediaWiki = (() => {
                     : this.eatWikiText(style)(stream, state);
             };
         }
-        // eslint-disable-next-line @typescript-eslint/class-methods-use-this
         eatEntity(stream, style) {
             const entity = stream.match(/^(?:#x[a-f\d]+|#\d+|[a-z\d]+);/iu);
             return entity && isHtmlEntity(entity[0]) ? tokens.htmlEntity : style;