@bhsd/codemirror-mediawiki 3.7.0 → 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';
@@ -36,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;

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));
         }
     }