@bhsd/codemirror-mediawiki 3.11.4 → 3.12.0

package/dist/statusBar.js

@@ -1,11 +1,13 @@
 import { showPanel, EditorView } from '@codemirror/view';
-import { nextDiagnostic, setDiagnosticsEffect } from '@codemirror/lint';
+import { setDiagnosticsEffect, } from '@codemirror/lint';
 import { gotoLine } from '@codemirror/search';
 import elt from 'crelt';
 import { menuRegistry } from './codemirror.js';
 import { panelSelector, diagnosticSelector, actionSelector, bgDark, } from './constants.js';
+import { nextDiagnostic } from './lint.js';
 const statusSelector = '.cm-panel-status', workerSelector = '.cm-status-worker', errorSelector = '.cm-status-error', warningSelector = '.cm-status-warning', enabledSelector = '.cm-status-fix-enabled', disabledSelector = '.cm-status-fix-disabled', menuSelector = '.cm-status-fix-menu', menuHover = `${menuSelector}>div:hover`, messageSelector = '.cm-status-message', workerCls = 'cm-status-worker-enabled', lineCls = 'cm-status-line';
-function getLintMarker(view, severity, menu) {
+function getLintMarker(cm, severity, menu) {
+    const view = cm.view;
     const marker = elt('div', { class: `cm-status-${severity}` }), icon = elt('div');
     if (severity === 'fix') {
         icon.className = disabledSelector.slice(1);
@@ -28,7 +30,7 @@ function getLintMarker(view, severity, menu) {
         marker.append(icon, elt('div', '0'));
         marker.addEventListener('click', () => {
             if (marker.parentElement?.classList.contains(workerCls)) {
-                nextDiagnostic(view);
+                nextDiagnostic(cm);
                 view.focus();
             }
         });
@@ -49,6 +51,12 @@ const updateDiagnosticMessage = (view, allDiagnostics, main, msg) => {
         msg.textContent = '';
     }
     else {
+        const cmp = main.head === main.from
+            ? (a, b) => Math.abs(a.from - main.from) - Math.abs(b.from - main.from)
+                || Math.abs(a.to - main.to) - Math.abs(b.to - main.to)
+            : (a, b) => Math.abs(a.to - main.to) - Math.abs(b.to - main.to)
+                || Math.abs(a.from - main.from) - Math.abs(b.from - main.from);
+        diagnostics.sort(cmp);
         const diagnostic = diagnostics.find(({ from, to }) => from <= main.head && to >= main.head) ?? diagnostics[0];
         if (diagnostic.renderMessage) {
             msg.replaceChildren(diagnostic.renderMessage(view));
@@ -126,7 +134,7 @@ export default (cm, fixer) => [
             });
             view.dom.append(menu);
         }
-        const error = getLintMarker(view, 'error'), warning = getLintMarker(view, 'warning'), fix = getLintMarker(view, 'fix', menu), { classList } = fix.firstChild, optionAll = elt('div', 'Fix all auto-fixable problems'), worker = elt('div', { class: workerSelector.slice(1) }, error, warning, fix), message = elt('div', { class: messageSelector.slice(1) }), position = elt('div', { class: lineCls }), dom = elt('div', { class: `${panelSelector.slice(1)} ${statusSelector.slice(1)}` }, worker, message, position);
+        const error = getLintMarker(cm, 'error'), warning = getLintMarker(cm, 'warning'), fix = getLintMarker(cm, 'fix', menu), { classList } = fix.firstChild, optionAll = elt('div', 'Fix all auto-fixable problems'), worker = elt('div', { class: workerSelector.slice(1) }, error, warning, fix), message = elt('div', { class: messageSelector.slice(1) }), position = elt('div', { class: lineCls }), dom = elt('div', { class: `${panelSelector.slice(1)} ${statusSelector.slice(1)}` }, worker, message, position);
         position.addEventListener('click', () => {
             gotoLine(view);
         });

package/dist/theme.d.ts

@@ -1,5 +1,5 @@
 import type { Extension } from '@codemirror/state';
-export declare const getLightHighlightStyle: () => Extension;
+export declare const lightHighlightStyle: Extension;
 export declare const light: Extension, 
 /**
  * @author 鬼影233

package/dist/theme.js

@@ -3,7 +3,7 @@ import { syntaxHighlighting, HighlightStyle, defaultHighlightStyle } from '@code
 import { nord as nordBase } 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 getLightHighlightStyle = () => syntaxHighlighting(HighlightStyle.define(defaultHighlightStyle.specs, { themeType: 'light' }));
+export const lightHighlightStyle = /* @__PURE__ */ (() => syntaxHighlighting(HighlightStyle.define(defaultHighlightStyle.specs, { themeType: 'light' })))();
 export const light = /* @__PURE__ */ EditorView.theme({
     '&': {
         backgroundColor: '#fff',

package/dist/token.d.ts

@@ -153,7 +153,7 @@ export declare class MediaWiki {
      */
     registerGroundTokens(): void;
     inChars({ length }: string, tag: TagName): Tokenizer<string>;
-    inStr(str: string, tag: TagName | false, errorTag?: TagName): Tokenizer<string>;
+    inStr(str: string, tag: string | false, errorTag?: string): Tokenizer<string>;
     eatWikiText(style: string): Tokenizer;
     eatApostrophes(obj: Pick<State, 'bold' | 'italic'>): Tokenizer<string | false>;
     eatExternalLinkProtocol({ length }: string, free?: boolean): Tokenizer;
@@ -168,7 +168,7 @@ export declare class MediaWiki {
     inTableDefinition(tr?: boolean, quote?: string): Tokenizer;
     get inTable(): Tokenizer;
     inTableCell(style: string, needAttr?: boolean, firstLine?: boolean): Tokenizer;
-    inSectionHeader(str: string): Tokenizer;
+    inSectionHeader(str: string, level: number): Tokenizer;
     get inComment(): Tokenizer<string>;
     eatExtTag(tagname: string, isCloseTag: boolean, state: State): string;
     eatHtmlTag(tagname: string, isCloseTag: boolean, state: State): string;

package/dist/token.js

@@ -112,7 +112,8 @@ const startState = (tokenize, tags, urlProtocols, sof = false) => ({
  */
 const copyState = (state) => {
     const result = { ...state };
-    for (const [key, val] of Object.entries(state)) {
+    for (const key in result) { // eslint-disable-line guard-for-in
+        const val = result[key];
         if (Array.isArray(val)) {
             // @ts-expect-error initial value
             result[key] = [...val];
@@ -122,7 +123,7 @@ const copyState = (state) => {
         }
         else if (key !== 'data' && val && typeof val === 'object') {
             // @ts-expect-error initial value
-            result[key] = { ...val };
+            result[key] = { ...val }; // eslint-disable-line @typescript-eslint/no-misused-spread
         }
     }
     return result;
@@ -261,6 +262,7 @@ export const makeLocalStyle = (style, state, endGround) => {
 const makeLocalTagStyle = (tag, state, endGround) => makeLocalStyle(tokens[tag], state, endGround);
 const makeStyle = (style, state, endGround) => [makeLocalStyle(style, state, endGround)];
 const makeTagStyle = (tag, state, endGround) => makeStyle(tokens[tag], state, endGround);
+const getTagStyle = (tag) => tag in tokens ? tokens[tag] : tag;
 /**
  * Remembers position and status for rollbacking.
  * It is needed for changing from bold to italic with apostrophes before it, if required.
@@ -576,21 +578,21 @@ let MediaWiki = (() => {
             };
         }
         inStr(str, tag, errorTag = 'error') {
+            tag &&= getTagStyle(tag);
+            errorTag = getTagStyle(errorTag);
             return (stream, state) => {
                 if (stream.match(str, Boolean(tag))) {
                     pop(state);
-                    return tag ? makeLocalTagStyle(tag, state) : '';
+                    return tag ? makeLocalStyle(tag, state) : '';
                 }
                 else if (!stream.skipTo(str)) {
                     stream.skipToEnd();
                 }
-                return makeLocalTagStyle(errorTag, state);
+                return makeLocalStyle(errorTag, state);
             };
         }
         eatWikiText(style) {
-            if (style in tokens) {
-                style = tokens[style];
-            }
+            style = getTagStyle(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) => {
                 let ch;
@@ -641,8 +643,9 @@ let MediaWiki = (() => {
                             // Title
                             if (tmp) {
                                 stream.backUp(tmp[2].length);
-                                chain(state, this.inSectionHeader(tmp[3]));
-                                return makeLocalStyle(`${tokens.sectionHeader} mw-section--${tmp[1].length + 1}`, state);
+                                const level = tmp[1].length + 1;
+                                chain(state, this.inSectionHeader(tmp[3], level));
+                                return makeLocalStyle(`${tokens.sectionHeader} mw-section--${level}`, state);
                             }
                             break;
                         }
@@ -1137,7 +1140,8 @@ let MediaWiki = (() => {
                     : this.eatWikiText(style)(stream, state);
             };
         }
-        inSectionHeader(str) {
+        inSectionHeader(str, level) {
+            const headerStyle = `${tokens.sectionHeader} mw-section--${level}`, style = `${tokens.section} mw-section--${level}`;
             return (stream, state) => {
                 if (stream.sol()) {
                     pop(state);
@@ -1146,16 +1150,16 @@ let MediaWiki = (() => {
                 else if (stream.match(headerRegex)) {
                     if (stream.eol()) {
                         stream.backUp(str.length);
-                        state.tokenize = this.inStr(str, 'sectionHeader');
+                        state.tokenize = this.inStr(str, headerStyle);
                     }
                     else if (stream.match(/^<!--(?!.*?-->.*?=)/u, false)) {
                         // T171074: handle trailing comments
                         stream.backUp(str.length);
-                        state.tokenize = this.inStr('<!--', false, 'sectionHeader');
+                        state.tokenize = this.inStr('<!--', false, headerStyle);
                     }
-                    return makeLocalTagStyle('section', state);
+                    return makeLocalStyle(style, state);
                 }
-                return this.eatWikiText('section')(stream, state);
+                return this.eatWikiText(style)(stream, state);
             };
         }
         get inComment() {
@@ -1734,8 +1738,13 @@ let MediaWiki = (() => {
                     stream.pos === oldToken?.pos
                         && stream.string === oldToken.string
                         && cmpNesting(state, oldToken.state)) {
-                        const { pos, string, state: { bold, italic, ...other }, style } = readyTokens[0];
-                        Object.assign(state, other);
+                        const { pos, string, state: other, style } = readyTokens[0];
+                        for (const key in other) {
+                            if (key !== 'bold' && key !== 'italic') {
+                                // @ts-expect-error assign readonly properties
+                                state[key] = other[key];
+                            }
+                        }
                         if (!(state.extName && state.extMode)
                             && state.nLink === 0
                             && typeof style === 'string'