@bhsd/codemirror-mediawiki 3.0.1 → 3.0.3

package/dist/codemirror.js

@@ -27,7 +27,6 @@ import toolKeymap from './keymap';
 import statusBar from './statusBar';
 import { detectIndent } from './indent';
 import bracketMatching from './matchBrackets';
-import wikitextLSP from './lsp';
 import javascript from './javascript';
 import css from './css';
 import lua from './lua';
@@ -323,15 +322,11 @@ export class CodeMirror6 {
      * @param lang language
      * @param config language configuration
      */
+    // eslint-disable-next-line @typescript-eslint/require-await
     async setLanguage(lang = 'plain', config) {
         this.#lang = lang;
         if (this.#view) {
-            let ext = (languages[lang] ?? plain)(config);
-            ws: { // eslint-disable-line no-unused-labels
-                if (lang === 'mediawiki') {
-                    ext = [ext, await wikitextLSP()];
-                }
-            }
+            const ext = (languages[lang] ?? plain)(config);
             this.#effects([
                 this.#language.reconfigure(ext),
                 this.#linter.reconfigure(linters[lang] ?? []),

package/dist/linter.js

@@ -6,16 +6,16 @@ import { styleLint } from '@bhsd/stylelint-util';
  * 计算位置
  * @param range 范围
  * @param lineOrOffset 行号或相对位置
- * @param columnOrPrefix 列号或前缀
+ * @param column 列号
  */
-const offsetAt = (range, lineOrOffset, columnOrPrefix) => {
-    if (typeof columnOrPrefix === 'string') {
-        return Math.min(range[1], range[0] + Math.max(0, lineOrOffset - columnOrPrefix.length));
+const offsetAt = (range, lineOrOffset, column) => {
+    if (column === undefined) {
+        return Math.min(range[1], range[0] + Math.max(0, lineOrOffset));
     }
     else if (lineOrOffset === -2) {
         return range[0];
     }
-    return lineOrOffset === 0 ? range[1] : range[0] + columnOrPrefix;
+    return lineOrOffset === 0 ? range[1] : range[0] + column;
 };
 /**
  * 获取伪CSS代码块的前缀
@@ -41,41 +41,41 @@ const indexToPos = (code, index) => {
  */
 export const getWikiLinter = async (opt, obj) => {
     await getWikiparse(opt?.['getConfig'], opt?.['i18n']);
-    const lsp = getLSP(obj, opt?.['include']);
+    const lsp = getLSP(obj, opt?.['include']), cssLint = await getCssLinter();
     return async (text, config) => {
         const defaultSeverity = config?.['defaultSeverity'] ?? 2, diagnostics = (await lsp.provideDiagnostics(text)).filter(({ code, severity }) => Number(config?.[code] ?? defaultSeverity) > Number(severity === 2)), tokens = 'findStyleTokens' in lsp && config?.['invalid-css'] !== '0' ? await lsp.findStyleTokens() : [];
         if (tokens.length === 0) {
             return diagnostics;
         }
-        const cssLint = await getCssLinter();
+        const lines = tokens.map((token, i) => `${getPrefix(token, i)}${sanitizeInlineStyle(token.childNodes[1].childNodes[0].data)
+            .replace(/\n/gu, ' ')}\n}`);
         return [
             ...diagnostics,
-            ...(await cssLint(tokens.map((token, i) => `${getPrefix(token, i)}${sanitizeInlineStyle(token.childNodes[1].childNodes[0].data)
-                .replace(/\n/gu, ' ')}\n}`).join('\n'), config?.['css'])).map(({ line, column, endLine, endColumn, rule, severity, text: message, fix }) => {
-                const i = Math.ceil(line / 3), prefix = getPrefix(tokens[i - 1], i), { range } = tokens[i - 1].childNodes[1].childNodes[0], from = offsetAt(range, line - 3 * i, column - 1);
-                return {
+            ...(await cssLint(lines.join('\n'), config?.['css']))
+                .map(({ line, column, endLine, endColumn, rule, severity, text: message, fix }) => {
+                const i = Math.ceil(line / 3), { length } = getPrefix(tokens[i - 1], i), { range } = tokens[i - 1].childNodes[1].childNodes[0], from = offsetAt(range, line - 3 * i, column - 1), diagnostic = {
                     from,
                     to: endLine === undefined ? from : offsetAt(range, endLine - 3 * i, endColumn - 1),
                     severity: severity === 'error' ? 1 : 2,
                     source: 'Stylelint',
                     code: rule,
                     message,
-                    ...fix
-                        ? {
-                            data: [
-                                {
-                                    range: {
-                                        start: indexToPos(text, offsetAt(range, fix.range[0], prefix)),
-                                        end: indexToPos(text, offsetAt(range, fix.range[1], prefix)),
-                                    },
-                                    newText: fix.text,
-                                    title: 'Fix: Stylelint',
-                                    fix: true,
-                                },
-                            ],
-                        }
-                        : {},
                 };
+                if (fix) {
+                    const before = lines.slice(0, i - 1).join('\n').length + 1 + length;
+                    diagnostic.data = [
+                        {
+                            range: {
+                                start: indexToPos(text, offsetAt(range, fix.range[0] - before)),
+                                end: indexToPos(text, offsetAt(range, fix.range[1] - before)),
+                            },
+                            newText: fix.text,
+                            title: 'Fix: Stylelint',
+                            fix: true,
+                        },
+                    ];
+                }
+                return diagnostic;
             }),
         ];
     };