@bhsd/codemirror-mediawiki 3.12.0 → 3.12.1

package/LICENSE

@@ -1,3 +1,22 @@
+@bhsd/codemirror-mediawiki
+Copyright (C) 2022  Bhsd
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

package/dist/bidi.js

@@ -4,10 +4,11 @@
  * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
  */
 import { EditorView, Direction, ViewPlugin, Decoration } from '@codemirror/view';
-import { Prec, RangeSetBuilder } from '@codemirror/state';
+import { Prec } from '@codemirror/state';
 import { syntaxTree } from '@codemirror/language';
 import { tokens } from './config.js';
 import { getTag } from './matchTag.js';
+import { pushDecoration } from './util.js';
 const isolateSelector = '.cm-bidi-isolate', ltrSelector = '.cm-bidi-ltr', cls = isolateSelector.slice(1), isolateLTR = Decoration.mark({
     class: `${cls} ${ltrSelector.slice(1)}`,
     bidiIsolate: Direction.LTR,
@@ -18,7 +19,7 @@ const isolateSelector = '.cm-bidi-isolate', ltrSelector = '.cm-bidi-ltr', cls =
  * @test
  */
 export const computeIsolates = ({ visibleRanges, state, textDirection }) => {
-    const set = new RangeSetBuilder();
+    const set = [];
     if (textDirection === Direction.RTL) {
         for (const { from, to } of visibleRanges) {
             let node = syntaxTree(state).resolve(from, 1), td = 0, table = 0, parameter = 0;
@@ -27,13 +28,13 @@ export const computeIsolates = ({ visibleRanges, state, textDirection }) => {
                 if (/-(?:ext|html)tag-bracket/u.test(name) && state.sliceDoc(f, t).includes('<')) {
                     const tag = getTag(state, nextSibling);
                     if (tag) {
-                        set.add(tag.from, tag.to, isolateLTR);
+                        pushDecoration(set, isolateLTR, tag);
                     }
                 }
                 else if (!td && !table && name.includes(tokens.tableDefinition)) {
                     if (/-html-(?:table|tr)/u.test(name)) {
                         table = state.doc.lineAt(f).to;
-                        set.add(f, table, isolateLTR);
+                        pushDecoration(set, isolateLTR, f, table);
                     }
                     else {
                         td = f;
@@ -43,18 +44,18 @@ export const computeIsolates = ({ visibleRanges, state, textDirection }) => {
                     table = 0;
                 }
                 else if (td && name.includes(tokens.tableDelimiter2)) {
-                    set.add(td, f, isolateLTR);
+                    pushDecoration(set, isolateLTR, td, f);
                     td = 0;
                 }
                 else if (/-(?:template|parserfunction)-delimiter/u.test(name)) {
                     if (parameter) {
-                        set.add(parameter, f, isolate);
+                        pushDecoration(set, isolate, parameter, f);
                     }
                     parameter = t;
                 }
                 else if (parameter && /-(?:template|parserfunction)-bracket/u.test(name)) {
                     if (state.sliceDoc(f, f + 1) === '}') {
-                        set.add(parameter, f, isolate);
+                        pushDecoration(set, isolate, parameter, f);
                     }
                     parameter = 0;
                 }
@@ -62,7 +63,7 @@ export const computeIsolates = ({ visibleRanges, state, textDirection }) => {
             }
         }
     }
-    return set.finish();
+    return Decoration.set(set, true);
 };
 export default [
     ViewPlugin.fromClass(class {

package/dist/constants.d.ts

@@ -1,3 +1,4 @@
-export declare const base: Record<'CDN', string | undefined>, hoverSelector = ".cm-tooltip-hover-mw", diagnosticSelector = ".cm-diagnosticText-clickable", panelSelector = ".cm-panel", panelsSelector = ".cm-panels", actionSelector = ".cm-diagnosticAction", noDetectionLangs: Set<string>, bgDark = "#4c566a", matchingCls = "cm-matchingTag", nonmatchingCls = "cm-nonmatchingTag";
+import { Decoration } from '@codemirror/view';
+export declare const base: Record<'CDN', string | undefined>, hoverSelector = ".cm-tooltip-hover-mw", diagnosticSelector = ".cm-diagnosticText-clickable", panelSelector = ".cm-panel", panelsSelector = ".cm-panels", actionSelector = ".cm-diagnosticAction", doctagMark: Decoration, typeMark: Decoration, noDetectionLangs: Set<string>, bgDark = "#4c566a", matchingCls = "cm-matchingTag", nonmatchingCls = "cm-nonmatchingTag";
 export declare const isWMF: boolean;
 export declare const isMac: boolean;

package/dist/constants.js

@@ -1,5 +1,6 @@
+import { Decoration } from '@codemirror/view';
 import { wmf } from '@bhsd/common';
-export const base = { CDN: undefined }, hoverSelector = '.cm-tooltip-hover-mw', diagnosticSelector = '.cm-diagnosticText-clickable', panelSelector = '.cm-panel', panelsSelector = '.cm-panels', actionSelector = '.cm-diagnosticAction', noDetectionLangs = new Set(['plain', 'mediawiki']), bgDark = '#4c566a', matchingCls = 'cm-matchingTag', nonmatchingCls = 'cm-nonmatchingTag';
+export const base = { CDN: undefined }, hoverSelector = '.cm-tooltip-hover-mw', diagnosticSelector = '.cm-diagnosticText-clickable', panelSelector = '.cm-panel', panelsSelector = '.cm-panels', actionSelector = '.cm-diagnosticAction', doctagMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-doctag' }), typeMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-doctag-type' }), noDetectionLangs = new Set(['plain', 'mediawiki']), bgDark = '#4c566a', matchingCls = 'cm-matchingTag', nonmatchingCls = 'cm-nonmatchingTag';
 export const isWMF = /* @__PURE__ */ (() => typeof location === 'object'
     && new RegExp(String.raw `\.(?:${wmf})\.org$`, 'u').test(location.hostname))();
 export const isMac = /* @__PURE__ */ (() => {

package/dist/fold.js

@@ -337,14 +337,17 @@ export const buildMarkers = (view) => {
 };
 const markers = /* @__PURE__ */ ViewPlugin.fromClass(class {
     constructor(view) {
+        this.tree = syntaxTree(view.state);
         this.markers = buildMarkers(view);
     }
     update({ docChanged, viewportChanged, startState, state, view }) {
+        const tree = syntaxTree(state);
         if (docChanged
             || viewportChanged
             || startState.facet(language) !== state.facet(language)
             || startState.field(foldState, false) !== state.field(foldState, false)
-            || syntaxTree(startState) !== syntaxTree(state)) {
+            || tree !== this.tree) {
+            this.tree = tree;
             this.markers = buildMarkers(view);
         }
     }

package/dist/html.js

@@ -4,7 +4,7 @@ import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
 import { cssLanguage } from '@codemirror/lang-css';
 import { LanguageSupport } from '@codemirror/language';
 import { cssCompletion } from './css.js';
-import { jsCompletion, markGlobalsPlugin } from './javascript.js';
+import { jsCompletion, markGlobalsAndDocTagPlugin } from './javascript.js';
 import { mediawikiBase } from './mediawiki.js';
 import { lightHighlightStyle } from './theme.js';
 export default (config, cm) => {
@@ -31,7 +31,7 @@ export default (config, cm) => {
         cssCompletion(),
         support,
         lightHighlightStyle,
-        markGlobalsPlugin(cm),
+        markGlobalsAndDocTagPlugin(cm),
     ]);
     Object.assign(langSupport, { nestedMWLanguage: language });
     return langSupport;

package/dist/javascript.d.ts

@@ -12,11 +12,11 @@ export declare const jsCompletion: Extension;
  */
 export declare const exclude: (state: EditorState, pos: number) => boolean;
 /**
- * 高亮显示全局变量
+ * 高亮显示全局变量和JSDoc标签
  * @ignore
  * @test
  */
-export declare const markGlobals: (tree: Tree, visibleRanges: readonly DocRange[], state: EditorState, cm?: CodeMirror6) => DecorationSet;
-export declare const markGlobalsPlugin: (cm?: CodeMirror6) => Extension;
+export declare const markGlobalsAndDocTag: (tree: Tree, visibleRanges: readonly DocRange[], state: EditorState, cm?: CodeMirror6) => DecorationSet;
+export declare const markGlobalsAndDocTagPlugin: (cm?: CodeMirror6) => Extension;
 declare const _default: (_?: unknown, cm?: CodeMirror6) => Extension;
 export default _default;

package/dist/javascript.js

@@ -3,6 +3,8 @@ 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));
 /**
@@ -14,11 +16,11 @@ const globalsMark = Decoration.mark({ class: 'cm-globals' }), builtinGlobals = n
 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) {
@@ -49,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);
+                        }
                     }
                 }
             },
@@ -60,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);
@@ -76,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);
         }
     }
 }, {
@@ -87,5 +104,5 @@ export const markGlobalsPlugin = (cm) => ViewPlugin.fromClass(class {
 export default (_, cm) => [
     js(),
     jsCompletion,
-    markGlobalsPlugin(cm),
+    markGlobalsAndDocTagPlugin(cm),
 ];

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,9 +1,10 @@
 /* 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 { leadingSpaces, sliceDoc, markDocTagType } from './util.js';
 import { lightHighlightStyle } from './theme.js';
 const map = {
     1: 'constant',
@@ -438,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 = [
     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);