@bhsd/codemirror-mediawiki 3.11.4 → 3.11.5

package/dist/codemirror.d.ts

@@ -1,6 +1,6 @@
 import { EditorView } from '@codemirror/view';
-import type { KeyBinding } from '@codemirror/view';
-import type { Extension } from '@codemirror/state';
+import type { ViewPlugin, KeyBinding, DecorationSet } from '@codemirror/view';
+import type { Extension, StateField } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
 import type { ConfigGetter } from '@bhsd/browser';
 import type { ConfigData } from 'wikiparser-node';
@@ -20,6 +20,18 @@ declare interface MenuItem {
     isActionable(this: void, cm: CodeMirror6): boolean;
     getItems(this: void, cm: CodeMirror6): HTMLElement[];
 }
+declare type LintExtension = [
+    unknown,
+    ViewPlugin<{
+        set: boolean;
+        force(): void;
+    }>,
+    [
+        StateField<{
+            diagnostics: DecorationSet;
+        }>
+    ]
+];
 declare interface OptionalFunctions {
     statusBar: typeof statusBar;
     detectIndent: typeof detectIndent;
@@ -82,6 +94,8 @@ export declare class CodeMirror6 {
      * @param lintSource function for syntax checking
      */
     lint(lintSource?: LintSources): void;
+    /** @private */
+    getLintExtension(): LintExtension | undefined;
     /** Update syntax checking immediately */
     update(): void;
     /**

package/dist/codemirror.js

@@ -3,10 +3,11 @@ import { EditorSelection, Compartment, EditorState, SelectionRange, } from '@cod
 import { syntaxHighlighting, defaultHighlightStyle, indentOnInput, indentUnit, ensureSyntaxTree, syntaxTree, } from '@codemirror/language';
 import { defaultKeymap, historyKeymap, history, redo, indentWithTab, insertNewlineKeepIndent, deleteCharBackwardStrict, } from '@codemirror/commands';
 import { searchKeymap } from '@codemirror/search';
-import { linter, lintGutter, nextDiagnostic } from '@codemirror/lint';
+import { linter, lintGutter } from '@codemirror/lint';
 import elt from 'crelt';
 import { base, panelSelector, panelsSelector, diagnosticSelector, noDetectionLangs } from './constants.js';
 import { light } from './theme.js';
+import { nextDiagnostic } from './lint.js';
 export const plain = () => [
     EditorView.contentAttributes.of({ spellcheck: 'true' }),
     keymap.of([
@@ -277,7 +278,7 @@ export class CodeMirror6 {
      */
     lint(lintSource) {
         const lintSources = typeof lintSource === 'function' ? [lintSource] : lintSource;
-        const linterExtension = (cm) => lintSources
+        const linterExtension = (cm) => lintSources?.length
             ? [
                 ...lintSources.map(source => linter(async ({ state }) => {
                     const diagnostics = (await source(state)).map((diagnostic) => ({
@@ -301,7 +302,7 @@ export class CodeMirror6 {
                     return diagnostics;
                 })),
                 lintGutter(),
-                keymap.of([{ key: 'F8', run: nextDiagnostic }]),
+                keymap.of([{ key: 'F8', run: () => nextDiagnostic(this) }]),
                 optionalFunctions.statusBar(cm, lintSources[0].fixer),
             ]
             : [];
@@ -318,15 +319,17 @@ export class CodeMirror6 {
             this.#minHeight(Boolean(lintSource));
         }
     }
+    /** @private */
+    getLintExtension() {
+        return this.#view && this.#linter.get(this.#view.state)[0];
+    }
     /** Update syntax checking immediately */
     update() {
-        if (this.#view) {
-            const [extension] = this.#linter.get(this.#view.state);
-            if (extension) {
-                const plugin = this.#view.plugin(extension[1]);
-                plugin.set = true;
-                plugin.force();
-            }
+        const extension = this.getLintExtension();
+        if (extension) {
+            const plugin = this.#view.plugin(extension[1]);
+            plugin.set = true;
+            plugin.force();
         }
     }
     /**
@@ -435,7 +438,7 @@ export class CodeMirror6 {
             this.#textarea.style.display = '';
             this.#textarea.setSelectionRange(from, to, head === to ? 'forward' : 'backward');
             if (hasFocus) {
-                this.#textarea.focus();
+                this.#textarea.focus({ preventScroll: true });
             }
             requestAnimationFrame(() => {
                 this.#textarea.scrollTop = scrollTop;

package/dist/lint.d.ts

@@ -0,0 +1,6 @@
+import type { CodeMirror6 } from './codemirror';
+/**
+ * 选中下一个诊断的范围
+ * @param cm CodeMirror6 实例
+ */
+export declare const nextDiagnostic: (cm: CodeMirror6) => boolean;

package/dist/lint.js

@@ -0,0 +1,28 @@
+const findDiagnostic = (deco, head, anchor = head) => {
+    let found;
+    deco.between(head, Infinity, (_, __, { spec: { diagnostics } }) => {
+        const next = diagnostics.sort((a, b) => a.from - b.from || a.to - b.to)
+            .find(({ from, to }) => from > head || from === head && to > anchor);
+        if (next) {
+            found = next;
+            return false;
+        }
+        return undefined;
+    });
+    return found;
+};
+/**
+ * 选中下一个诊断的范围
+ * @param cm CodeMirror6 实例
+ */
+export const nextDiagnostic = (cm) => {
+    const view = cm.view, { state } = view, { diagnostics } = state.field(cm.getLintExtension()[2][0]), { from, to } = state.selection.main, next = findDiagnostic(diagnostics, from, to) ?? findDiagnostic(diagnostics, 0);
+    if (!next || next.from === from && next.to === to) {
+        return false;
+    }
+    view.dispatch({
+        selection: { anchor: next.from, head: next.to },
+        scrollIntoView: true,
+    });
+    return true;
+};