@bhsd/codemirror-mediawiki 3.4.2 → 3.5.1

package/README.md

@@ -1221,7 +1221,6 @@ registerSignatureHelp();
 
 ### Extension
 
-1. [Extension:Translate](https://www.mediawiki.org/wiki/Extension:Translate) is not supported.
 1. [Extension:Poem](https://www.mediawiki.org/wiki/Extension:Poem) should prevent preformatted text ([Example](http://bhsd-harry.github.io/monaco-wiki/tests.html#%3Cpoem%3E%20with%20leading%20whitespace)).
 
 ### Transclusion

package/dist/codemirror.d.ts

@@ -6,7 +6,7 @@ import type { ConfigData } from 'wikiparser-node';
 import type { MwConfig } from './token';
 import type { DocRange, foldHandler } from './fold';
 import type { Option, LiveOption } from './linter';
-import type { LintSource, LintSourceGetter } from './lintsource';
+import type { LintSource, LintSources, LintSourceGetter } from './lintsource';
 import type { detectIndent } from './indent';
 import type statusBar from './statusBar';
 export type AddonMain<T> = (config?: T, cm?: CodeMirror6) => Extension;
@@ -67,7 +67,7 @@ export declare class CodeMirror6 {
      * Start syntax checking
      * @param lintSource function for syntax checking
      */
-    lint(lintSource?: LintSource): void;
+    lint(lintSource?: LintSources): void;
     /** Update syntax checking immediately */
     update(): void;
     /**

package/dist/codemirror.js

@@ -225,20 +225,21 @@ export class CodeMirror6 {
      * @param lintSource function for syntax checking
      */
     lint(lintSource) {
-        const linterExtension = lintSource
+        const lintSources = typeof lintSource === 'function' ? [lintSource] : lintSource;
+        const linterExtension = lintSources
             ? [
-                linter(async ({ state }) => {
-                    const diagnostics = await lintSource(state);
+                ...lintSources.map(source => linter(async ({ state }) => {
+                    const diagnostics = await source(state);
                     if (state.readOnly) {
                         for (const diagnostic of diagnostics) {
                             delete diagnostic.actions;
                         }
                     }
                     return diagnostics;
-                }),
+                })),
                 lintGutter(),
                 keymap.of(lintKeymap),
-                optionalFunctions.statusBar(this, lintSource.fixer),
+                optionalFunctions.statusBar(this, lintSources[0].fixer),
             ]
             : [];
         if (lintSource) {

package/dist/html.js

@@ -1,5 +1,5 @@
 import { configureNesting } from '@lezer/html';
-import { htmlPlain, htmlCompletionSourceWith } from '@codemirror/lang-html';
+import { htmlLanguage, htmlCompletionSourceWith } from '@codemirror/lang-html';
 import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
 import { cssLanguage } from '@codemirror/lang-css';
 import { LanguageSupport } from '@codemirror/language';
@@ -7,14 +7,14 @@ import { jsCompletion } from './javascript';
 import { mediawiki } from './mediawiki';
 import { cssCompletion } from './css';
 export default (config) => {
-    const { language, support } = mediawiki(config), lang = new LanguageSupport(htmlPlain.configure({
+    const { language, support } = mediawiki(config), lang = new LanguageSupport(htmlLanguage.configure({
         wrap: configureNesting([
             { tag: 'script', parser: javascriptLanguage.parser },
             { tag: 'style', parser: cssLanguage.parser },
             { tag: 'noinclude', parser: language.parser },
         ], [{ name: 'style', parser: cssLanguage.parser.configure({ top: 'Styles' }) }]),
     }), [
-        htmlPlain.data.of({
+        htmlLanguage.data.of({
             autocomplete: htmlCompletionSourceWith({
                 extraTags: {
                     noinclude: { globalAttrs: false },

package/dist/lintsource.d.ts

@@ -6,7 +6,14 @@ 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>;
+/**
+ * 获取Linter选项
+ * @param opt Linter选项
+ * @param runtime 是否为运行时选项
+ */
+export declare const getOpt: (opt: Option | LiveOption, runtime?: boolean) => Option | Promise<Option>;
 export declare const getWikiLintSource: LintSourceGetter;
 export declare const getJsLintSource: LintSourceGetter;
 export declare const getCssLintSource: LintSourceGetter;

package/dist/lintsource.js

@@ -9,7 +9,7 @@ import { posToIndex } from './hover';
  * @param opt Linter选项
  * @param runtime 是否为运行时选项
  */
-const getOpt = (opt, runtime) => typeof opt === 'function' ? opt(runtime) : opt;
+export const getOpt = (opt, runtime) => typeof opt === 'function' ? opt(runtime) : opt;
 /**
  * 获取指定行列的位置
  * @param doc 文档