@bhsd/codemirror-mediawiki 3.11.5 → 3.12.1

package/dist/javascript.js

@@ -3,14 +3,24 @@ import { ViewPlugin, Decoration } from '@codemirror/view';
 import { syntaxTree } from '@codemirror/language';
 import { setDiagnosticsEffect } from '@codemirror/lint';
 import { builtin } from './javascript-globals.js';
+import { doctagMark } from './constants.js';
+import { markDocTagType, pushDecoration } from './util.js';
 export const jsCompletion = javascriptLanguage.data.of({ autocomplete: scopeCompletionSource(globalThis) });
 const globalsMark = Decoration.mark({ class: 'cm-globals' }), builtinGlobals = new Set(Object.keys(builtin));
 /**
- * 高亮显示全局变量
+ * 忽略JavaScript正则表达式中的括号匹配
+ * @param state
+ * @param pos 位置
+ * @test
+ */
+export const exclude = (state, pos) => javascriptLanguage.isActiveAt(state, pos, 0)
+    && syntaxTree(state).resolveInner(pos, 0).name === 'RegExp';
+/**
+ * 高亮显示全局变量和JSDoc标签
  * @ignore
  * @test
  */
-export const markGlobals = (tree, visibleRanges, state, cm) => {
+export const markGlobalsAndDocTag = (tree, visibleRanges, state, cm) => {
     const decorations = [];
     let allGlobals = builtinGlobals;
     if (cm?.lintSources.length && typeof eslint === 'object' && 'environments' in eslint) {
@@ -41,10 +51,25 @@ export const markGlobals = (tree, visibleRanges, state, cm) => {
             to,
             enter({ type, from: f, to: t }) {
                 const name = state.sliceDoc(f, t);
-                if (type.is('VariableName') && javascriptLanguage.isActiveAt(state, f) && allGlobals.has(name)) {
+                if (!javascriptLanguage.isActiveAt(state, f)) {
+                    //
+                }
+                else if (type.is('VariableName') && allGlobals.has(name)) {
                     const completions = localCompletionSource({ state, pos: t, explicit: true });
                     if (!completions?.options.some(({ label }) => label === name)) {
-                        decorations.push(globalsMark.range(f, t));
+                        pushDecoration(decorations, globalsMark, f, t);
+                    }
+                }
+                else if (type.is('BlockComment') && /^\/\*{2}(?!\*)/u.test(name)) {
+                    const comment = name.slice(2), mtAll = comment.matchAll(/^[ \t]*\*\s*(@[a-z]+)(\s+\{(?!\}))?|\{(@[a-z]+)/dgimu);
+                    for (const mt of mtAll) {
+                        if (mt[3]) {
+                            const [start, end] = mt.indices[3];
+                            pushDecoration(decorations, doctagMark, f + start + 2, f + end + 2);
+                        }
+                        else {
+                            markDocTagType(decorations, f + 2, mt);
+                        }
                     }
                 }
             },
@@ -52,10 +77,10 @@ export const markGlobals = (tree, visibleRanges, state, cm) => {
     }
     return Decoration.set(decorations);
 };
-export const markGlobalsPlugin = (cm) => ViewPlugin.fromClass(class {
+export const markGlobalsAndDocTagPlugin = (cm) => ViewPlugin.fromClass(class {
     constructor({ state, visibleRanges }) {
         this.tree = syntaxTree(state);
-        this.decorations = markGlobals(this.tree, visibleRanges, state, cm);
+        this.decorations = markGlobalsAndDocTag(this.tree, visibleRanges, state, cm);
     }
     update({ docChanged, viewportChanged, state, view: { visibleRanges }, transactions }) {
         const tree = syntaxTree(state);
@@ -68,7 +93,7 @@ export const markGlobalsPlugin = (cm) => ViewPlugin.fromClass(class {
             flag = transactions.some(tr => tr.effects.some(e => e.is(setDiagnosticsEffect)));
         }
         if (flag) {
-            this.decorations = markGlobals(tree, visibleRanges, state, cm);
+            this.decorations = markGlobalsAndDocTag(tree, visibleRanges, state, cm);
         }
     }
 }, {
@@ -79,5 +104,5 @@ export const markGlobalsPlugin = (cm) => ViewPlugin.fromClass(class {
 export default (_, cm) => [
     js(),
     jsCompletion,
-    markGlobalsPlugin(cm),
+    markGlobalsAndDocTagPlugin(cm),
 ];

package/dist/linter.js

@@ -1,5 +1,3 @@
-/** @todo revert df69718ab908966bff162fe51e8cfb4595e6b2ec */
-import { rules as recommended } from '@eslint/js/src/configs/eslint-recommended.js';
 import { sanitizeInlineStyle } from '@bhsd/common';
 import { loadScript, getWikiparse, getLSP } from '@bhsd/browser';
 import { styleLint } from '@bhsd/stylelint-util';
@@ -131,6 +129,9 @@ export const jsConfig = /* #__PURE__ */ (() => ({
  * @test
  */
 export const getJsLinter = async (cdn = eslintRepo) => {
+    /** @todo revert df69718ab908966bff162fe51e8cfb4595e6b2ec */
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const { rules: recommended } = require('@eslint/js/src/configs/eslint-recommended.js');
     await loadScript(cdn, 'eslint');
     /** @see https://www.npmjs.com/package/@codemirror/lang-javascript */
     const esLinter = new eslint.Linter(), conf = {

package/dist/lua.d.ts

@@ -1,3 +1,19 @@
+import { ViewPlugin } from '@codemirror/view';
 import { LanguageSupport } from '@codemirror/language';
+import type { ViewUpdate, DecorationSet } from '@codemirror/view';
+import type { EditorState } from '@codemirror/state';
+import type { Tree } from '@lezer/common';
+import type { DocRange } from './fold';
+/**
+ * 高亮显示LDoc标签
+ * @ignore
+ * @test
+ */
+export declare const markDocTag: (tree: Tree, visibleRanges: readonly DocRange[], state: EditorState) => DecorationSet;
+export declare const markDocTagPlugin: ViewPlugin<{
+    tree: Tree;
+    decorations: DecorationSet;
+    update({ docChanged, viewportChanged, state, view: { visibleRanges } }: ViewUpdate): void;
+}, undefined>;
 declare const _default: () => LanguageSupport;
 export default _default;

package/dist/lua.js

@@ -1,10 +1,11 @@
 /* eslint-disable no-template-curly-in-string */
 import { lua } from '@codemirror/legacy-modes/mode/lua';
+import { ViewPlugin, Decoration } from '@codemirror/view';
 import { syntaxTree, LanguageSupport, StreamLanguage, foldService, HighlightStyle, syntaxHighlighting, } from '@codemirror/language';
 import { snippetCompletion } from '@codemirror/autocomplete';
 import { tags } from '@lezer/highlight';
-import { leadingSpaces, sliceDoc } from './util.js';
-import { getLightHighlightStyle } from './theme.js';
+import { leadingSpaces, sliceDoc, markDocTagType } from './util.js';
+import { lightHighlightStyle } from './theme.js';
 const map = {
     1: 'constant',
     2: 'function',
@@ -130,6 +131,7 @@ const map = {
             server: 1,
             siteName: 1,
             stylePath: 1,
+            wikiId: 1,
             namespaces: 3,
             contentNamespaces: 3,
             subjectNamespaces: 3,
@@ -437,10 +439,65 @@ const fold = ({ doc, tabSize }, start, from) => {
     }
     return empty || j === number ? null : { from, to: doc.line(j).to };
 };
+/**
+ * 高亮显示LDoc标签
+ * @ignore
+ * @test
+ */
+export const markDocTag = (tree, visibleRanges, state) => {
+    const decorations = [];
+    for (const { from, to } of visibleRanges) {
+        let node = tree.resolveInner(from, 1);
+        while (node && node.from < to) {
+            if (node.name === 'comment') {
+                const firstLine = sliceDoc(state, node), block = firstLine.startsWith('--[[--');
+                if (block
+                    || firstLine.startsWith('---')
+                        && !(firstLine.endsWith('--') && /[^-]/u.test(firstLine))) {
+                    while (node.name === 'comment') {
+                        const comment = sliceDoc(state, node), mt = /^\s*(?:-{2,}\s*)?(@[a-z]+)(\s+\{(?!\}))?/diu.exec(comment);
+                        if (mt) {
+                            markDocTagType(decorations, node.from, mt);
+                        }
+                        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+                        const { nextSibling } = node;
+                        if (!nextSibling || (block
+                            ? comment.endsWith(']]')
+                            : state.sliceDoc(node.to, nextSibling.from)
+                                .split('\n', 3).length > 2)) {
+                            break;
+                        }
+                        node = nextSibling;
+                    }
+                }
+            }
+            node = node.nextSibling;
+        }
+    }
+    return Decoration.set(decorations);
+};
+export const markDocTagPlugin = ViewPlugin.fromClass(class {
+    constructor({ state, visibleRanges }) {
+        this.tree = syntaxTree(state);
+        this.decorations = markDocTag(this.tree, visibleRanges, state);
+    }
+    update({ docChanged, viewportChanged, state, view: { visibleRanges } }) {
+        const tree = syntaxTree(state);
+        if (docChanged || viewportChanged || tree !== this.tree) {
+            this.tree = tree;
+            this.decorations = markDocTag(tree, visibleRanges, state);
+        }
+    }
+}, {
+    decorations(v) {
+        return v.decorations;
+    },
+});
 const support = [
-    getLightHighlightStyle(),
+    lightHighlightStyle,
     syntaxHighlighting(HighlightStyle.define([{ tag: tags.standard(tags.variableName), class: 'cm-globals' }])),
     lang.data.of({ autocomplete: source }),
     foldService.of(fold),
+    markDocTagPlugin,
 ];
 export default () => new LanguageSupport(lang, support);