@bhsd/codemirror-mediawiki 3.6.7 → 3.7.1

package/dist/codemirror.d.ts

@@ -2,6 +2,7 @@ import { EditorView } from '@codemirror/view';
 import type { KeyBinding } from '@codemirror/view';
 import type { Extension } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
+import type { ConfigGetter } from '@bhsd/browser';
 import type { ConfigData } from 'wikiparser-node';
 import type { DocRange, foldHandler } from './fold';
 import type { detectIndent } from './indent';
@@ -9,6 +10,7 @@ import type { Option, LiveOption } from './linter';
 import type { LintSource, LintSources, LintSourceGetter } from './lintsource';
 import type statusBar from './statusBar';
 import type { MwConfig } from './token';
+import type { Selection } from './matchBrackets';
 export type AddonMain<T> = (config?: T, cm?: CodeMirror6) => Extension;
 export type Addon<T> = [AddonMain<T>, Record<string, T>?];
 export type Dialect = 'sanitized-css' | undefined;
@@ -35,7 +37,7 @@ export declare class CodeMirror6 {
     #private;
     /** only for sanitized-css */
     dialect: Dialect;
-    getWikiConfig?: () => Promise<ConfigData>;
+    getWikiConfig?: ConfigGetter;
     langConfig: MwConfig | undefined;
     /** textarea element */
     get textarea(): HTMLTextAreaElement;
@@ -128,10 +130,7 @@ export declare class CodeMirror6 {
      * Scroll to the specified position
      * @param position position or selection range
      */
-    scrollTo(position?: number | {
-        anchor: number;
-        head: number;
-    }): void;
+    scrollTo(position?: number | Selection): void;
     /**
      * Set the editor theme
      * @param theme theme name

package/dist/codemirror.js

@@ -97,7 +97,7 @@ export class CodeMirror6 {
         let timer;
         const { textarea, lang } = this, { value, dir: d, accessKey, tabIndex, lang: l, readOnly } = textarea, extensions = [
             this.#language.of(this.#getLanguage(config)),
-            this.#linter.of(linters[lang] ?? []),
+            this.#linter.of(linters[lang]?.(this) ?? []),
             this.#extensions.of([]),
             this.#dir.of(EditorView.editorAttributes.of({ dir: d })),
             this.#extraKeys.of([]),
@@ -219,9 +219,9 @@ export class CodeMirror6 {
             const ext = this.#getLanguage(config);
             this.#effects([
                 this.#language.reconfigure(ext),
-                this.#linter.reconfigure(linters[lang] ?? []),
+                this.#linter.reconfigure(linters[lang]?.(this) ?? []),
             ]);
-            this.#minHeight(Boolean(linters[lang]));
+            this.#minHeight(lang in linters);
             this.prefer({});
         }
     }
@@ -231,7 +231,7 @@ export class CodeMirror6 {
      */
     lint(lintSource) {
         const lintSources = typeof lintSource === 'function' ? [lintSource] : lintSource;
-        const linterExtension = lintSources
+        const linterExtension = (cm) => lintSources
             ? [
                 ...lintSources.map(source => linter(async ({ state }) => {
                     const diagnostics = (await source(state)).map((diagnostic) => ({
@@ -256,7 +256,7 @@ export class CodeMirror6 {
                 })),
                 lintGutter(),
                 keymap.of(lintKeymap),
-                optionalFunctions.statusBar(this, lintSources[0].fixer),
+                optionalFunctions.statusBar(cm, lintSources[0].fixer),
             ]
             : [];
         if (lintSource) {
@@ -266,7 +266,7 @@ export class CodeMirror6 {
             delete linters[this.#lang];
         }
         if (this.#view) {
-            this.#effects(this.#linter.reconfigure(linterExtension));
+            this.#effects(this.#linter.reconfigure(linterExtension(this)));
             this.#minHeight(Boolean(lintSource));
         }
     }

package/dist/fold.js

@@ -338,7 +338,14 @@ export const foldRef = /* @__PURE__ */ foldCommand(true), unfoldRef = (view) =>
     }
     return false;
 };
-export default ((e = defaultFoldExtension) => e);
+export default ((e = defaultFoldExtension) => [
+    e,
+    EditorView.theme({
+        '.cm-foldGutter': {
+            order: 2,
+        },
+    }),
+]);
 export const mediaWikiFold = /* @__PURE__ */ (() => [
     codeFolding({
         placeholderDOM(view) {

package/dist/lintsource.d.ts

@@ -1,13 +1,16 @@
 import type { EditorView } from '@codemirror/view';
 import type { EditorState, Text } from '@codemirror/state';
 import type { Language } from '@codemirror/language';
-import type { Diagnostic } from '@codemirror/lint';
+import type { Diagnostic, Action } from '@codemirror/lint';
 import type { Option, LiveOption } from './linter';
 export type LintSource = ((state: EditorState) => Diagnostic[] | Promise<Diagnostic[]>) & {
     fixer?: (doc: Text, rule?: string) => string | Promise<string>;
 };
 export type LintSources = LintSource | [LintSource] | [LintSource, LintSource];
 export type LintSourceGetter = (opt?: Option | LiveOption, view?: EditorView, nestedMWLanguage?: Language) => LintSource | Promise<LintSource>;
+export interface ExtendedAction extends Action {
+    tooltip: string | undefined;
+}
 /**
  * 获取Linter选项
  * @param opt Linter选项

package/dist/lintsource.js

@@ -74,9 +74,14 @@ const jsLintSource = (esLint, code, opt, doc, f = 0, t) => esLint(code, opt)
     if (fix || suggestions.length > 0) {
         diagnostic.actions = [
             ...fix ? [{ name: 'fix', fix }] : [],
-            ...suggestions.map(suggestion => ({ name: suggestion.messageId || 'suggestion', fix: suggestion.fix })),
-        ].map(({ name, fix: { range: [from, to], text } }) => ({
+            ...suggestions.map(suggestion => ({
+                name: suggestion.messageId || 'suggestion',
+                fix: suggestion.fix,
+                tooltip: suggestion.desc,
+            })),
+        ].map(({ name, fix: { range: [from, to], text }, tooltip }) => ({
             name,
+            tooltip,
             apply(view) {
                 view.dispatch({
                     changes: { from: from + f, to: to + f, insert: text },