@bhsd/codemirror-mediawiki 3.1.0 → 3.3.0

package/dist/static.d.ts

@@ -19,9 +19,5 @@ export declare const tagModes: {
     combobox: string;
     combooption: string;
     inputbox: string;
-    templatedata: string;
-    mapframe: string;
-    maplink: string;
-    graph: string;
 };
 export declare const getStaticMwConfig: ({ variable, parserFunction: [p0, p1, ...p2], protocol, nsid, functionHook, variants, redirection, ext, doubleUnderscore: [d0, d1, d2, d3], img, }: ConfigData, modes: Record<string, string>) => MwConfig;

package/dist/static.js

@@ -17,10 +17,6 @@ export const tagModes = {
     combobox: 'text/combobox',
     combooption: 'mediawiki',
     inputbox: 'text/inputbox',
-    templatedata: 'json',
-    mapframe: 'json',
-    maplink: 'json',
-    graph: 'json',
 };
 export const getStaticMwConfig = ({ variable, parserFunction: [p0, p1, ...p2], protocol, nsid, functionHook, variants, redirection, ext, doubleUnderscore: [d0, d1, d2, d3], img, }, modes) => ({
     tags: Object.fromEntries(ext.map(s => [s, true])),

package/dist/statusBar.d.ts

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

package/dist/statusBar.js

@@ -1,5 +1,11 @@
 import { showPanel } from '@codemirror/view';
 import { nextDiagnostic, setDiagnosticsEffect } from '@codemirror/lint';
+import { menuRegistry } from './codemirror';
+const optionAll = /* @__PURE__ */ (() => {
+    const ele = document.createElement('div');
+    ele.textContent = 'Fix all auto-fixable problems';
+    return ele;
+})();
 function getLintMarker(view, severity, menu) {
     const marker = document.createElement('div'), icon = document.createElement('div');
     marker.className = `cm-status-${severity}`;
@@ -37,9 +43,19 @@ const updateDiagnosticsCount = (diagnostics, s, marker) => {
     marker.lastChild.textContent = String(diagnostics.filter(({ severity }) => severity === s).length);
 };
 const hasFix = (diagnostic) => diagnostic.actions?.some(({ name }) => name === 'fix' || name.startsWith('Fix:'));
-const updateDiagnosticMessage = (view, allDiagnostics, main, msg, menu) => {
-    const diagnostics = allDiagnostics.filter(({ from, to }) => from <= main.to && to >= main.from), diagnostic = diagnostics.find(({ from, to }) => from <= main.head && to >= main.head) ?? diagnostics[0];
-    if (diagnostic) {
+const isItemActionable = (cm, { name, isActionable }) => cm.hasPreference(name) && isActionable(cm);
+const toggleClass = (classList, enabled) => {
+    classList.toggle('cm-status-fix-enabled', enabled);
+    classList.toggle('cm-status-fix-disabled', !enabled);
+};
+const getDiagnostics = (all, main) => all.filter(({ from, to }) => from <= main.to && to >= main.from);
+const updateDiagnosticMessage = (cm, allDiagnostics, main, msg) => {
+    const diagnostics = getDiagnostics(allDiagnostics, main);
+    if (diagnostics.length === 0) {
+        msg.textContent = '';
+    }
+    else {
+        const diagnostic = diagnostics.find(({ from, to }) => from <= main.head && to >= main.head) ?? diagnostics[0], view = cm.view;
         msg.textContent = diagnostic.message;
         if (diagnostic.actions) {
             msg.append(...diagnostic.actions.map(({ name, apply }) => {
@@ -55,52 +71,58 @@ const updateDiagnosticMessage = (view, allDiagnostics, main, msg, menu) => {
             }));
         }
     }
-    else {
-        msg.textContent = '';
-    }
+};
+const updateMenu = (cm, allDiagnostics, main, classList, menu, fixer) => {
     if (menu) {
-        menu.replaceChildren(...[
-            ...new Set(diagnostics.filter(hasFix)
-                .map(({ message }) => / \(([^()]+)\)$/u.exec(message)?.[1])
-                .filter(Boolean)),
-        ].map(rule => {
+        const actionable = menuRegistry.filter(item => isItemActionable(cm, item)), fixable = new Set(fixer && getDiagnostics(allDiagnostics, main).filter(hasFix)
+            .map(({ message }) => / \(([^()]+)\)$/u.exec(message)?.[1])
+            .filter(Boolean));
+        if (actionable.length === 0 && fixable.size === 0) {
+            toggleClass(classList, false);
+            return;
+        }
+        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`;
             option.dataset['rule'] = rule;
             return option;
-        }), menu.lastChild);
+        });
+        if (fixable.size > 0) {
+            quickfix.push(optionAll);
+        }
+        menu.replaceChildren(...actions, ...quickfix);
     }
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export default (fixer) => showPanel.of(view => {
+export default (cm, fixer) => showPanel.of(view => {
     let diagnostics = [], menu;
-    if (fixer) {
-        const optionAll = document.createElement('div');
-        optionAll.textContent = 'Fix all auto-fixable problems';
+    if (!view.state.readOnly && (fixer || menuRegistry.length > 0)) {
         menu = document.createElement('div');
         menu.className = 'cm-status-fix-menu';
         menu.tabIndex = -1;
-        menu.append(optionAll);
-        menu.addEventListener('click', ({ target }) => {
-            if (target === menu) {
-                return;
-            }
-            (async () => {
-                const { doc } = view.state, output = await fixer(doc, target.dataset['rule']);
-                if (output !== doc.toString()) {
-                    view.dispatch({
-                        changes: { from: 0, to: doc.length, insert: output },
-                    });
+        if (fixer) {
+            menu.addEventListener('click', ({ target }) => {
+                if (target === menu) {
+                    return;
                 }
-                view.focus();
-            })();
-        });
+                (async () => {
+                    const { doc } = view.state, output = await fixer(doc, target.dataset['rule']);
+                    if (output !== doc.toString()) {
+                        view.dispatch({
+                            changes: { from: 0, to: doc.length, insert: output },
+                        });
+                    }
+                    view.focus();
+                })();
+            });
+        }
         menu.addEventListener('focusout', () => {
             menu.style.display = 'none';
         });
         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);
+    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';
@@ -110,23 +132,22 @@ export default (fixer) => showPanel.of(view => {
     dom.append(worker, message, position);
     return {
         dom,
-        update({ state: { selection: { main }, doc, readOnly }, transactions, docChanged, selectionSet }) {
+        update({ state: { selection: { main }, doc }, transactions, docChanged, selectionSet }) {
             for (const tr of transactions) {
                 for (const effect of tr.effects) {
                     if (effect.is(setDiagnosticsEffect)) {
                         diagnostics = effect.value;
-                        const fixable = !readOnly && Boolean(fixer) && diagnostics.some(hasFix), { classList } = fix.firstChild;
-                        classList.toggle('cm-status-fix-enabled', fixable);
-                        classList.toggle('cm-status-fix-disabled', !fixable);
                         worker.classList.toggle('cm-status-worker-enabled', diagnostics.length > 0);
                         updateDiagnosticsCount(diagnostics, 'error', error);
                         updateDiagnosticsCount(diagnostics, 'warning', warning);
-                        updateDiagnosticMessage(view, diagnostics, main, message, menu);
+                        updateDiagnosticMessage(cm, diagnostics, main, message);
+                        updateMenu(cm, diagnostics, main, classList, menu, fixer);
                     }
                 }
             }
             if (docChanged || selectionSet) {
-                updateDiagnosticMessage(view, diagnostics, main, message, menu);
+                updateDiagnosticMessage(cm, diagnostics, main, message);
+                updateMenu(cm, diagnostics, main, classList, menu, fixer);
                 const { number, from } = doc.lineAt(main.head);
                 position.textContent = `${number}:${main.head - from}`;
                 if (!main.empty) {

package/dist/theme.d.ts

@@ -0,0 +1,8 @@
+import type { Extension } from '@codemirror/state';
+export declare const light: Extension, 
+/**
+ * @author 鬼影233
+ * @author Bhsd
+ * @see https://zh.moegirl.org.cn/User:%E9%AC%BC%E5%BD%B1233/nord-moeskin.css
+ */
+nord: Extension;

package/dist/theme.js

@@ -0,0 +1,108 @@
+import { EditorView } from '@codemirror/view';
+import { nord as nordBase } from 'cm6-theme-nord';
+export const light = /* @__PURE__ */ EditorView.theme({
+    '&': {
+        backgroundColor: '#fff',
+    },
+    '&.cm-focused .cm-matchingTag': {
+        backgroundColor: 'rgb(50,140,130,.32)',
+    },
+    '&.cm-focused .cm-nonmatchingTag': {
+        backgroundColor: 'rgb(187,85,85,.27)',
+    },
+    '.cm-tooltip-hover code': {
+        backgroundColor: '#e0e6eb',
+    },
+    '.cm-status-fix-menu': {
+        backgroundColor: '#f5f5f5',
+        boxShadow: '0 2px 2px 0 rgb(0,0,0,.25)',
+    },
+    '.cm-status-fix-menu>div:hover': {
+        backgroundColor: '#e2f2ff',
+    },
+    '.cm-status-message': {
+        borderColor: '#c8ccd1',
+    },
+    '.cm-content': {
+        '--cm-arg': '#b0c',
+        '--cm-attr': '#179b1c',
+        '--cm-comment': '#7b8c8f',
+        '--cm-convert': '#b68',
+        '--cm-entity': '#00a1a1',
+        '--cm-error': '#d73333',
+        '--cm-func': '#a11',
+        '--cm-hr': '#0076dd',
+        '--cm-hr-bg': 'rgb(0,0,0,.07)',
+        '--cm-link': '#000aaa',
+        '--cm-sect': '#006fe6',
+        '--cm-sp': 'rgb(134,206,255,.3)',
+        '--cm-table': '#d08',
+        '--cm-table-attr': '#f500d4',
+        '--cm-tag': '#14866d',
+        '--cm-tpl': '#80c',
+        '--cm-var': '#ad9300',
+        '--cm-var-name': '#ac6600',
+    },
+}), 
+/**
+ * @author 鬼影233
+ * @author Bhsd
+ * @see https://zh.moegirl.org.cn/User:%E9%AC%BC%E5%BD%B1233/nord-moeskin.css
+ */
+nord = [
+    nordBase,
+    /* @__PURE__ */ EditorView.theme({
+        'div.cm-activeLine': {
+            backgroundColor: '#4c566a44',
+        },
+        '&.cm-focused .cm-matchingTag, &.cm-focused .cm-nonmatchingTag': {
+            outline: '1px solid #8fbcbb',
+        },
+        '&.cm-focused .cm-matchingTag': {
+            backgroundColor: '#eceff4',
+            color: '#434c5e',
+        },
+        ['&.cm-focused>.cm-scroller>.cm-selectionLayer div.cm-selectionBackground,'
+            + '.cm-tooltip-hover code, .cm-status-fix-menu>div:hover, .cm-diagnosticAction, div.cm-tooltip-fold']: {
+            backgroundColor: '#4c566a',
+        },
+        'div.cm-panels': {
+            color: '#d8dee9',
+        },
+        '.cm-status-fix-menu': {
+            backgroundColor: '#252a33',
+        },
+        '.cm-status-message': {
+            borderColor: '#000',
+        },
+        '&.cm-focused .cm-searchMatch.cm-searchMatch-selected': {
+            color: '#b48ead',
+        },
+        'div.cm-tooltip-autocomplete ul li[aria-selected]': {
+            color: 'inherit',
+        },
+        'div.cm-gutters': {
+            color: '#5e81ac',
+        },
+        '.cm-content': {
+            '--cm-arg': '#9f78a5',
+            '--cm-attr': '#97b757',
+            '--cm-comment': '#4c566a',
+            '--cm-convert': '#b68',
+            '--cm-entity': '#00a1a1',
+            '--cm-error': '#bf616a',
+            '--cm-func': '#bf616a',
+            '--cm-hr': '#5e81ac',
+            '--cm-hr-bg': '#3b4252',
+            '--cm-link': '#5e81ac',
+            '--cm-sect': '#81a1c1',
+            '--cm-sp': '#88c0d0',
+            '--cm-table': '#b48ead',
+            '--cm-table-attr': '#9f78a5',
+            '--cm-tag': '#a3be8c',
+            '--cm-tpl': '#9f78a5',
+            '--cm-var': '#d08770',
+            '--cm-var-name': '#d08770',
+        },
+    }),
+];

package/dist/token.d.ts

@@ -181,8 +181,5 @@ export declare class MediaWiki {
     'text/inputbox'(): StreamParser<State>;
     inGallery(section?: boolean): Tokenizer;
     'text/gallery'(tags: string[]): StreamParser<State>;
-    javascript(): StreamParser<unknown>;
-    json(): StreamParser<unknown>;
-    lua(): StreamParser<unknown>;
 }
 export {};

package/dist/token.js

@@ -41,8 +41,6 @@ import { Tag } from '@lezer/highlight';
 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) {
@@ -1268,7 +1266,7 @@ let MediaWiki = (() => {
                 else if (stream.eat('>')) {
                     const { config: { tagModes } } = this;
                     state.extName = name;
-                    state.extMode ||= name in tagModes
+                    state.extMode ||= name in tagModes && (tagModes[name]) in this
                         && this[tagModes[name]](state.data.tags.filter(tag => tag !== name));
                     if (state.extMode) {
                         state.extState = state.extMode.startState(0);
@@ -1992,15 +1990,6 @@ let MediaWiki = (() => {
                 },
             };
         }
-        javascript() {
-            return javascript;
-        }
-        json() {
-            return json;
-        }
-        lua() {
-            return lua;
-        }
     };
 })();
 export { MediaWiki };

package/dist/vue.js

@@ -3,12 +3,12 @@ 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';
+import { cssCompletion } from './css';
 export default () => vue({
     base: new LanguageSupport(htmlLanguage, [
         htmlLanguage.data.of({ autocomplete: htmlCompletionSource }),
         javascript().support,
         jsCompletion,
-        css(undefined).support,
+        cssCompletion(),
     ]),
 });