@bhsd/codemirror-mediawiki 3.1.0 → 3.3.0

package/dist/index.js

@@ -4,29 +4,31 @@ import { highlightSelectionMatches } from '@codemirror/search';
 import { closeBrackets, autocompletion, acceptCompletion, completionKeymap, startCompletion, } from '@codemirror/autocomplete';
 import { json } from '@codemirror/lang-json';
 import { autoCloseTags } from '@codemirror/lang-html';
-import { css as cssParser } from '@codemirror/legacy-modes/mode/css';
 import { getLSP } from '@bhsd/browser';
 import { colorPicker as cssColorPicker, colorPickerTheme, makeColorPicker } from '@bhsd/codemirror-css-color-picker';
 import colorPicker, { discoverColors } from './color';
-import { mediawiki, html, FullMediaWiki } from './mediawiki';
+import { mediawiki } from './mediawiki';
 import escape from './escape';
-import codeFolding, { mediaWikiFold } from './fold';
+import codeFolding, { mediaWikiFold, foldHandler } from './fold';
 import tagMatchingState from './matchTag';
 import refHover from './ref';
 import magicWordHover from './hover';
 import signatureHelp from './signature';
 import inlayHints from './inlay';
-import { getWikiLintSource, getJsLintSource, getCssLintSource, getJsonLintSource, getLuaLintSource, getVueLintSource, } from './lintsource';
+import { getWikiLintSource, getJsLintSource, getCssLintSource, getJsonLintSource, getLuaLintSource, getVueLintSource, getHTMLLintSource, } from './lintsource';
 import openLinks from './openLinks';
 import { tagModes, getStaticMwConfig } from './static';
 import bidiIsolation from './bidi';
 import toolKeymap from './keymap';
 import bracketMatching from './matchBrackets';
+import statusBar from './statusBar';
+import { detectIndent } from './indent';
 import javascript from './javascript';
 import css from './css';
 import lua from './lua';
 import vue from './vue';
-import { CodeMirror6, avail, languages, linterRegistry, destroyListeners, plain } from './codemirror';
+import html from './html';
+import { CodeMirror6, avail, languages, linterRegistry, destroyListeners, plain, optionalFunctions, themes, } from './codemirror';
 export { CodeMirror6 };
 /**
  * 注册通用扩展
@@ -103,7 +105,7 @@ export const registerColorPicker = () => {
 };
 /** 注册所有通用扩展（除`colorPicker`） */
 const registerExtensions = () => {
-    highlightSpecialChars();
+    registerHighlightSpecialChars();
     registerHighlightActiveLine();
     registerHighlightWhitespace();
     registerHighlightTrailingWhitespace();
@@ -187,7 +189,7 @@ export const registerInlayHints = () => {
 export const registerColorPickerForMediaWiki = () => {
     registerLangExtension('mediawiki', 'colorPicker', [
         [makeColorPicker({ discoverColors }), colorPickerTheme],
-        { marginLeft: '0.6ch' },
+        { marginLeft: '.6ch' },
     ]);
 };
 /** Register the `bracketMatching` extension for MediaWiki */
@@ -200,6 +202,16 @@ export const registerBracketMatchingForMediaWiki = () => {
 /** Register the `codeFolding` extension for MediaWiki */
 export const registerCodeFoldingForMediaWiki = () => {
     registerLangExtension('mediawiki', 'codeFolding', mediaWikiFold);
+    optionalFunctions.foldHandler = foldHandler;
+};
+/**
+ * 注册LintSource
+ * @param lang 语言
+ * @param lintSource
+ */
+const registerLintSource = (lang, lintSource) => {
+    linterRegistry[lang] = lintSource;
+    optionalFunctions.statusBar = statusBar;
 };
 /** Register MediaWiki core language support */
 export const registerMediaWikiCore = () => {
@@ -210,22 +222,29 @@ export const registerMediaWikiCore = () => {
         bidiIsolation,
         toolKeymap,
     ];
-    linterRegistry['mediawiki'] = getWikiLintSource;
+    registerLintSource('mediawiki', getWikiLintSource);
     destroyListeners.push(view => getLSP(view)?.destroy());
 };
 /** Register mixed MediaWiki-HTML language support */
 export const registerHTML = () => {
     registerCommonExtensions();
     registerHTMLCore();
+    registerCloseBracketsForHTML();
+    registerColorPickerForHTML();
 };
-/** Register HTML core language support */
+/** Register the `closeBrackets` extension for mixed MediaWiki-HTML */
+export const registerCloseBracketsForHTML = () => {
+    registerLangExtension('html', 'closeBrackets', autoCloseTags);
+};
+/** Register the `colorPicker` extension for mixed MediaWiki-HTML */
+export const registerColorPickerForHTML = () => {
+    registerLangExtension('html', 'colorPicker', [cssColorPicker]);
+};
+/** Register mixed MediaWiki-HTML core language support */
 export const registerHTMLCore = () => {
-    Object.assign(FullMediaWiki.prototype, {
-        css() {
-            return cssParser;
-        },
-    });
     languages['html'] = html;
+    registerLintSource('html', getHTMLLintSource);
+    optionalFunctions.detectIndent = detectIndent;
 };
 /** Register JavaScript language support */
 export const registerJavaScript = () => {
@@ -235,7 +254,8 @@ export const registerJavaScript = () => {
 /** Register JavaScript core language support */
 export const registerJavaScriptCore = () => {
     languages['javascript'] = javascript;
-    linterRegistry['javascript'] = getJsLintSource;
+    registerLintSource('javascript', getJsLintSource);
+    optionalFunctions.detectIndent = detectIndent;
 };
 /** Register CSS language support */
 export const registerCSS = () => {
@@ -250,7 +270,8 @@ export const registerColorPickerForCSS = () => {
 /** Register CSS core language support */
 export const registerCSSCore = () => {
     languages['css'] = css;
-    linterRegistry['css'] = getCssLintSource;
+    registerLintSource('css', getCssLintSource);
+    optionalFunctions.detectIndent = detectIndent;
 };
 /** Register JSON language support */
 export const registerJSON = () => {
@@ -260,7 +281,8 @@ export const registerJSON = () => {
 /** Register JSON core language support */
 export const registerJSONCore = () => {
     languages['json'] = json;
-    linterRegistry['json'] = getJsonLintSource;
+    registerLintSource('json', getJsonLintSource);
+    optionalFunctions.detectIndent = detectIndent;
 };
 /** Register Lua language support */
 export const registerLua = () => {
@@ -270,7 +292,8 @@ export const registerLua = () => {
 /** Register Lua core language support */
 export const registerLuaCore = () => {
     languages['lua'] = lua;
-    linterRegistry['lua'] = getLuaLintSource;
+    registerLintSource('lua', getLuaLintSource);
+    optionalFunctions.detectIndent = detectIndent;
 };
 /** Register Vue language support */
 export const registerVue = () => {
@@ -290,7 +313,8 @@ export const registerColorPickerForVue = () => {
 /** Register Vue core language support */
 export const registerVueCore = () => {
     languages['vue'] = vue;
-    linterRegistry['vue'] = getVueLintSource;
+    registerLintSource('vue', getVueLintSource);
+    optionalFunctions.detectIndent = detectIndent;
 };
 /**
  * Register a custom language support
@@ -311,6 +335,10 @@ export const registerLanguage = (name, lang, lintSource) => {
 export const registerLanguageCore = (name, lang, lintSource) => {
     languages[name] = lang;
     if (lintSource) {
-        linterRegistry[name] = lintSource;
+        registerLintSource(name, lintSource);
     }
 };
+export const registerTheme = (name, theme) => {
+    themes[name] = theme;
+};
+export { nord } from './theme';

package/dist/lintsource.d.ts

@@ -1,14 +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 { Option, LiveOption } from './linter';
 export type LintSource = ((state: EditorState) => Diagnostic[] | Promise<Diagnostic[]>) & {
     fixer?: (doc: Text, rule?: string) => string | Promise<string>;
 };
-export type LintSourceGetter = (opt?: Option | LiveOption, view?: EditorView) => LintSource | Promise<LintSource>;
+export type LintSourceGetter = (opt?: Option | LiveOption, view?: EditorView, nestedMWLanguage?: Language) => LintSource | Promise<LintSource>;
 export declare const getWikiLintSource: LintSourceGetter;
 export declare const getJsLintSource: LintSourceGetter;
 export declare const getCssLintSource: LintSourceGetter;
 export declare const getVueLintSource: LintSourceGetter;
+export declare const getHTMLLintSource: LintSourceGetter;
 export declare const getJsonLintSource: LintSourceGetter;
 export declare const getLuaLintSource: LintSourceGetter;

package/dist/lintsource.js

@@ -25,33 +25,6 @@ const pos = (doc, line, column, from = 0) => {
         character: (line === 1 ? from - lineDesc.from : 0) + column - 1,
     });
 };
-export const getWikiLintSource = async (opt, v) => {
-    const wikiLint = await getWikiLinter(await getOpt(opt), v);
-    const lintSource = async ({ doc }) => (await wikiLint(doc.toString(), await getOpt(opt, true)))
-        .map(({ severity, code, message, range: r, from, to, data = [], source }) => ({
-        source: source,
-        from: from ?? posToIndex(doc, r.start),
-        to: to ?? posToIndex(doc, r.end),
-        severity: severity === 2 ? 'warning' : 'error',
-        message: source === 'Stylelint' ? message : `${message} (${code})`,
-        actions: data.map(({ title, range, newText }) => ({
-            name: title,
-            apply(view) {
-                view.dispatch({
-                    changes: {
-                        from: posToIndex(doc, range.start),
-                        to: posToIndex(doc, range.end),
-                        insert: newText,
-                    },
-                });
-            },
-        })),
-    }));
-    if (wikiLint.fixer) {
-        lintSource.fixer = (_, rule) => wikiLint.fixer('', rule);
-    }
-    return lintSource;
-};
 const getRange = (doc, line, column, endLine, endColumn, f = 0, t = Infinity) => {
     const start = pos(doc, line, column, f);
     return {
@@ -59,6 +32,35 @@ const getRange = (doc, line, column, endLine, endColumn, f = 0, t = Infinity) =>
         to: endLine === undefined ? Math.min(t, start + 1) : pos(doc, endLine, endColumn, f),
     };
 };
+const wikiLintSource = async (wikiLint, text, opt, doc, f = 0, t) => (await wikiLint(text, opt))
+    .map(({ severity, code, message, range: r, from, to, data = [], source }) => ({
+    source: source,
+    severity: severity === 2 ? 'warning' : 'error',
+    message: source === 'Stylelint' ? message : `${message} (${code})`,
+    actions: data.map(({ title, range, newText }) => ({
+        name: title,
+        apply(view) {
+            view.dispatch({
+                changes: {
+                    from: posToIndex(doc, range.start),
+                    to: posToIndex(doc, range.end),
+                    insert: newText,
+                },
+            });
+        },
+    })),
+    ...from === undefined
+        ? getRange(doc, r.start.line + 1, r.start.character + 1, r.end.line + 1, r.end.character + 1, f, t)
+        : { from: from + f, to: (to ?? from) + f },
+}));
+export const getWikiLintSource = async (opt, v) => {
+    const wikiLint = await getWikiLinter(await getOpt(opt), v);
+    const lintSource = async ({ doc }) => wikiLintSource(wikiLint, doc.toString(), await getOpt(opt, true), doc);
+    if (wikiLint.fixer) {
+        lintSource.fixer = (_, rule) => wikiLint.fixer('', rule);
+    }
+    return lintSource;
+};
 const jsLintSource = (esLint, code, opt, doc, f = 0, t) => esLint(code, opt)
     .map(({ ruleId, message, severity, line, column, endLine, endColumn, fix, suggestions = [] }) => {
     const diagnostic = {
@@ -80,6 +82,12 @@ const jsLintSource = (esLint, code, opt, doc, f = 0, t) => esLint(code, opt)
     }
     return diagnostic;
 });
+export const getJsLintSource = async (opt) => {
+    const esLint = await getJsLinter();
+    const lintSource = async ({ doc }) => jsLintSource(esLint, doc.toString(), await getOpt(opt), doc);
+    lintSource.fixer = (doc, rule) => esLint.fixer(doc.toString(), rule);
+    return lintSource;
+};
 const cssLintSource = async (styleLint, code, opt, doc, f = 0, t) => {
     let option = opt ?? {};
     if (!('extends' in option || 'rules' in option)) {
@@ -108,12 +116,6 @@ const cssLintSource = async (styleLint, code, opt, doc, f = 0, t) => {
         return diagnostic;
     });
 };
-export const getJsLintSource = async (opt) => {
-    const esLint = await getJsLinter();
-    const lintSource = async ({ doc }) => jsLintSource(esLint, doc.toString(), await getOpt(opt), doc);
-    lintSource.fixer = (doc, rule) => esLint.fixer(doc.toString(), rule);
-    return lintSource;
-};
 export const getCssLintSource = async (opt) => {
     const styleLint = await getCssLinter();
     const lintSource = async ({ doc }) => cssLintSource(styleLint, doc.toString(), await getOpt(opt), doc);
@@ -132,6 +134,17 @@ export const getVueLintSource = async (opt) => {
         ];
     };
 };
+export const getHTMLLintSource = async (opt, view, language) => {
+    const vueLintSource = await getVueLintSource(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt) }, view);
+    return async (state) => {
+        const { doc } = state, option = await getOpt(opt) ?? {}, wiki = option['wiki'];
+        return [
+            ...await vueLintSource(state),
+            ...(await Promise.all(language.findRegions(state)
+                .map(({ from, to }) => wikiLintSource(wikiLint, state.sliceDoc(from, to), wiki, doc, from, to)))).flat(),
+        ];
+    };
+};
 export const getJsonLintSource = () => {
     const jsonLint = getJsonLinter();
     return ({ doc }) => {