@bhsd/codemirror-mediawiki 3.12.0 → 3.12.2

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/codemirror.js

@@ -5,7 +5,7 @@ import { defaultKeymap, historyKeymap, history, redo, indentWithTab, insertNewli
 import { search, searchKeymap } from '@codemirror/search';
 import { linter, lintGutter } from '@codemirror/lint';
 import elt from 'crelt';
-import { base, panelSelector, panelsSelector, diagnosticSelector, noDetectionLangs } from './constants.js';
+import { baseData, panelSelector, panelsSelector, diagnosticSelector, noDetectionLangs } from './constants.js';
 import { light } from './theme.js';
 import { nextDiagnostic } from './lint.js';
 export const plain = () => [
@@ -62,10 +62,10 @@ export const replaceSelections = (view, func) => {
 /** CodeMirror 6 editor */
 export class CodeMirror6 {
     static get CDN() {
-        return base.CDN;
+        return baseData.CDN;
     }
     static set CDN(url) {
-        base.CDN = url;
+        baseData.CDN = url;
     }
     #textarea;
     #language = new Compartment();
@@ -301,10 +301,10 @@ export class CodeMirror6 {
                     const diagnostics = (await source(state)).map((diagnostic) => ({
                         ...diagnostic,
                         renderMessage(view) {
-                            const span = elt('span', { class: diagnosticSelector.slice(1) }, diagnostic.renderMessage?.(view) ?? diagnostic.message);
+                            const span = elt('span', { class: diagnosticSelector.slice(1) }, diagnostic.renderMessage?.call(this, view) ?? this.message);
                             span.addEventListener('click', () => {
                                 view.dispatch({
-                                    selection: { anchor: diagnostic.from, head: diagnostic.to },
+                                    selection: { anchor: this.from, head: this.to },
                                 });
                                 view.focus();
                             });

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 baseData: 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 baseData = { 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/escape.js

@@ -3,7 +3,7 @@ import { EditorSelection } from '@codemirror/state';
 import { indentMore, indentLess } from '@codemirror/commands';
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
-import { base } from './constants.js';
+import { baseData } from './constants.js';
 import { replaceSelections, menuRegistry, } from './codemirror.js';
 import { sliceDoc, toConfigGetter, } from './util.js';
 const entity = { '"': 'quot', "'": 'apos', '<': 'lt', '>': 'gt', '&': 'amp', ' ': 'nbsp' };
@@ -70,7 +70,7 @@ escapeWiki = async (view, lsp) => {
     }));
 };
 const escapeWikiCommand = (view, getConfig) => {
-    const lsp = getLSP(view, false, getConfig, base.CDN);
+    const lsp = getLSP(view, false, getConfig, baseData.CDN);
     if (lsp && 'provideRefactoringAction' in lsp && view.state.selection.ranges.some(({ empty }) => !empty)) {
         void escapeWiki(view, lsp);
         return true;
@@ -99,7 +99,7 @@ menuRegistry.push({
                 handlerBase(view, e);
             });
             items = [btnHTML, btnURI];
-            const lsp = getLSP(view, false, cm.getWikiConfig, base.CDN);
+            const lsp = getLSP(view, false, cm.getWikiConfig, baseData.CDN);
             if (lsp && 'provideRefactoringAction' in lsp) {
                 const btnWiki = elt('div', 'Escape with magic words');
                 btnWiki.addEventListener('click', e => {

package/dist/fold.d.ts

@@ -17,7 +17,7 @@ export declare const updateSelection: AnchorUpdate, updateAll: AnchorUpdate;
  * @param refOnly 是否仅检查`<ref>`标签
  * @test
  */
-export declare const foldable: (state: EditorState, posOrNode: number | SyntaxNode, tree?: Tree | null, refOnly?: boolean) => DocRange | false;
+export declare const foldableInline: (state: EditorState, posOrNode: number | SyntaxNode, tree?: Tree | null, refOnly?: boolean) => DocRange | false;
 /**
  * 折叠所有模板
  * @param state
@@ -31,7 +31,7 @@ export declare const foldable: (state: EditorState, posOrNode: number | SyntaxNo
  * @test
  */
 export declare const traverse: (state: EditorState, tree: Tree, effects: StateEffect<DocRange>[], node: SyntaxNode | null, end: number, anchor: number, update: AnchorUpdate, refOnly?: boolean) => number;
-declare class FoldMarker extends GutterMarker {
+declare class MyFoldMarker extends GutterMarker {
     readonly open: boolean;
     constructor(open: boolean);
     eq(other: this): boolean;
@@ -48,7 +48,7 @@ export declare const foldableLine: ({ state, viewportLineBlocks }: EditorView, {
  * @param view
  * @test
  */
-export declare const buildMarkers: (view: EditorView) => RangeSet<FoldMarker>;
+export declare const buildMarkers: (view: EditorView) => RangeSet<MyFoldMarker>;
 /**
  * 生成折叠命令
  * @param refOnly 是否仅检查`<ref>`标签
@@ -62,7 +62,7 @@ export declare const unfoldRef: Command;
  * @param view
  * @test
  */
-export declare const selectedLines: (view: EditorView) => BlockInfo[];
+export declare const mySelectedLines: (view: EditorView) => BlockInfo[];
 /**
  * Fold the template at the selection/cursor
  * @param view

package/dist/fold.js

@@ -47,7 +47,7 @@ const refNames = new Set(['ref', 'references']);
  * @param refOnly 是否仅检查`<ref>`标签
  * @test
  */
-export const foldable = (state, posOrNode, tree, refOnly = false) => {
+export const foldableInline = (state, posOrNode, tree, refOnly = false) => {
     if (typeof posOrNode === 'number') {
         tree = ensureSyntaxTree(state, posOrNode);
     }
@@ -141,7 +141,7 @@ const foldSelector = '.cm-tooltip-fold';
  * @param state
  */
 const create = (state) => {
-    const { head } = state.selection.main, range = foldable(state, head);
+    const { head } = state.selection.main, range = foldableInline(state, head);
     if (range) {
         const { from, to } = range;
         let folded = false;
@@ -207,7 +207,7 @@ export const traverse = (state, tree, effects, node, end, anchor, update, refOnl
     while (node && (node.from < end
         || node.from === end
             && !(isTemplateBracket(node) && sliceDoc(state, node).startsWith('}}')))) {
-        const range = foldable(state, node, tree, refOnly);
+        const range = foldableInline(state, node, tree, refOnly);
         if (range) {
             effects.push(foldEffect.of(range));
             node = tree.resolve(range.to, 1);
@@ -219,7 +219,7 @@ export const traverse = (state, tree, effects, node, end, anchor, update, refOnl
     }
     return anchor;
 };
-class FoldMarker extends GutterMarker {
+class MyFoldMarker extends GutterMarker {
     constructor(open) {
         super();
         this.open = open;
@@ -231,8 +231,8 @@ class FoldMarker extends GutterMarker {
         return elt('span', { title: state.phrase(this.open ? 'Fold line' : 'Unfold line') }, this.open ? '⌄' : '›');
     }
 }
-const canFold = /* @__PURE__ */ new FoldMarker(true), canUnfold = /* @__PURE__ */ new FoldMarker(false);
-const findFold = ({ state }, line) => {
+const canFold = /* @__PURE__ */ new MyFoldMarker(true), canUnfold = /* @__PURE__ */ new MyFoldMarker(false);
+const myFindFold = ({ state }, line) => {
     let found;
     state.field(foldState, false)?.between(line.from, line.to, (from, to) => {
         if (!found && to === line.to) {
@@ -323,7 +323,7 @@ export const buildMarkers = (view) => {
     const builder = new RangeSetBuilder();
     for (const line of view.viewportLineBlocks) {
         let mark;
-        if (findFold(view, line)) {
+        if (myFindFold(view, line)) {
             mark = canUnfold;
         }
         else if (foldableLine(view, line)) {
@@ -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);
         }
     }
@@ -390,7 +393,7 @@ export const unfoldRef = (view) => {
  * @param view
  * @test
  */
-export const selectedLines = (view) => {
+export const mySelectedLines = (view) => {
     const lines = [];
     for (const { head } of view.state.selection.ranges) {
         if (lines.some(({ from, to }) => from <= head && to >= head)) {
@@ -400,7 +403,7 @@ export const selectedLines = (view) => {
     }
     return lines;
 };
-const foldCode = (view, line) => {
+const myFoldCode = (view, line) => {
     const range = foldableLine(view, line);
     if (range) {
         view.dispatch({ effects: foldEffect.of(range) });
@@ -408,8 +411,8 @@ const foldCode = (view, line) => {
     }
     return false;
 };
-const unfoldCode = (view, line) => {
-    const folded = findFold(view, line);
+const myUnfoldCode = (view, line) => {
+    const folded = myFindFold(view, line);
     return folded && unfoldEffect.of(folded);
 };
 /**
@@ -434,8 +437,8 @@ export const foldAt = view => {
     if (effects.length > 0) {
         return execute(view, effects, anchor);
     }
-    for (const line of selectedLines(view)) {
-        if (foldCode(view, line)) {
+    for (const line of mySelectedLines(view)) {
+        if (myFoldCode(view, line)) {
             return true;
         }
     }
@@ -512,8 +515,8 @@ export const mediawikiFold = /* @__PURE__ */ (() => [
                     view.dispatch({ effects, selection });
                     return true;
                 }
-                for (const line of selectedLines(view)) {
-                    const effect = unfoldCode(view, line);
+                for (const line of mySelectedLines(view)) {
+                    const effect = myUnfoldCode(view, line);
                     if (effect) {
                         effects.push(effect);
                     }
@@ -534,16 +537,16 @@ export const mediawikiFold = /* @__PURE__ */ (() => [
             return view.plugin(markers)?.markers ?? RangeSet.empty;
         },
         initialSpacer() {
-            return new FoldMarker(false);
+            return new MyFoldMarker(false);
         },
         domEventHandlers: {
             click(view, line) {
-                const effects = unfoldCode(view, line);
+                const effects = myUnfoldCode(view, line);
                 if (effects) {
                     view.dispatch({ effects });
                     return true;
                 }
-                return foldCode(view, line);
+                return myFoldCode(view, line);
             },
         },
     }),

package/dist/hover.js

@@ -2,7 +2,7 @@ import { hoverTooltip, EditorView } from '@codemirror/view';
 import { ensureSyntaxTree } from '@codemirror/language';
 import { getLSP, loadScript, } from '@bhsd/browser';
 import { tokens } from './config.js';
-import { base, hoverSelector, bgDark } from './constants.js';
+import { baseData, hoverSelector, bgDark } from './constants.js';
 import { indexToPos, posToIndex, createTooltipView, toConfigGetter, escHTML, sliceDoc, findTemplateName, } from './util.js';
 const code = `${hoverSelector} code`;
 /**
@@ -58,13 +58,13 @@ export default (articlePath, templatedata) => (cm) => {
         hoverTooltip(async (view, pos, side) => {
             const { state } = view, { doc } = state;
             const { paramSuggest, tags } = cm.langConfig;
-            let hover = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideHover(doc.toString(), indexToPos(doc, pos));
+            let hover = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), baseData.CDN)?.provideHover(doc.toString(), indexToPos(doc, pos));
             if (!hover && paramSuggest && 'templatedata' in tags) {
                 // eslint-disable-next-line require-atomic-updates
                 hover = await getHoverFromApi(state, pos, side, paramSuggest, templatedata);
             }
             if (hover) {
-                const { CDN = '' } = base;
+                const { CDN = '' } = baseData;
                 await loadScript(`${CDN}${CDN && '/'}npm/marked/lib/marked.umd.js`, 'marked', true);
                 const { end } = hover.range;
                 return {

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/index.d.ts

@@ -159,4 +159,4 @@ export declare const registerLanguage: (name: string, lang: (config?: unknown) =
  */
 export declare const registerLanguageCore: (name: string, lang: (config?: unknown) => LanguageSupport, lintSource?: LintSourceGetter) => void;
 export declare const registerTheme: (name: string, theme: Extension) => void;
-export { nord } from './theme.js';
+export { nordDark as nord } from './theme.js';

package/dist/index.js

@@ -422,4 +422,4 @@ export const registerLanguageCore = (name, lang, lintSource) => {
 export const registerTheme = (name, theme) => {
     themes[name] = theme;
 };
-export { nord } from './theme.js';
+export { nordDark as nord } from './theme.js';

package/dist/inlay.js

@@ -2,7 +2,7 @@ import { StateField, StateEffect } from '@codemirror/state';
 import { Decoration, EditorView, WidgetType, ViewPlugin } from '@codemirror/view';
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
-import { base } from './constants.js';
+import { baseData } from './constants.js';
 import { posToIndex, toConfigGetter, } from './util.js';
 const cls = 'cm-inlay-hint';
 class InlayHintWidget extends WidgetType {
@@ -54,7 +54,7 @@ export default (articlePath) => (cm) => {
         field,
         ViewPlugin.define(view => {
             const timer = setInterval(() => {
-                if (getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)) {
+                if (getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), baseData.CDN)) {
                     clearInterval(timer);
                     void update({ view, docChanged: true });
                 }

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,8 +3,10 @@ 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));
+const globalsMark = Decoration.mark({ class: 'cm-globals' }), varMark = Decoration.mark({ class: 'cm-doctag-var' }), builtinGlobals = new Set(Object.keys(builtin));
 /**
  * 忽略JavaScript正则表达式中的括号匹配
  * @param state
@@ -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,29 @@ 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), pos = f + 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, pos + start, pos + end);
+                        }
+                        else {
+                            const index = markDocTagType(decorations, pos, mt), m = /^\s+([a-z_]\w*)\s+-/diu.exec(comment.slice(index));
+                            if (m) {
+                                const [start, end] = m.indices[1];
+                                pushDecoration(decorations, varMark, pos + index + start, pos + index + end);
+                            }
+                        }
                     }
                 }
             },
@@ -60,10 +81,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 +97,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 +108,5 @@ export const markGlobalsPlugin = (cm) => ViewPlugin.fromClass(class {
 export default (_, cm) => [
     js(),
     jsCompletion,
-    markGlobalsPlugin(cm),
+    markGlobalsAndDocTagPlugin(cm),
 ];

package/dist/json.d.ts

@@ -0,0 +1,8 @@
+import type { StreamParser, StringStream } from '@codemirror/language';
+declare interface State {
+    tokenize: Tokenizer;
+    wb: boolean;
+}
+declare type Tokenizer = (stream: StringStream, state: State) => string;
+export declare const jsonBasic: StreamParser<State>, jsonc: StreamParser<State>;
+export {};

package/dist/json.js

@@ -0,0 +1,108 @@
+const tokenNumber = (stream, state) => {
+    if (stream.match(/^\d+(?:\.\d+)?(?:e[+-]?\d+)?/iu)) {
+        state.wb = false;
+        return 'number';
+    }
+    state.wb = true;
+    return '';
+};
+const mkJson = (jsoncMode) => {
+    // Tokenizer
+    const tokenComment = (stream, state) => {
+        if (stream.skipTo('*/')) {
+            stream.next();
+            stream.next();
+            state.tokenize = tokenBase;
+        }
+        else {
+            stream.skipToEnd();
+        }
+        return 'comment';
+    };
+    const tokenBase = (stream, state) => {
+        if (stream.eatSpace()) {
+            state.wb = true;
+            return '';
+        }
+        const ch = stream.next();
+        switch (ch) {
+            case '{':
+            case '}':
+                state.wb = true;
+                return 'brace';
+            case '[':
+            case ']':
+                state.wb = true;
+                return 'squareBracket';
+            case ':':
+            case ',':
+                state.wb = true;
+                return 'separator';
+            case '/':
+                state.wb = true;
+                if (jsoncMode) {
+                    if (stream.eat('/')) {
+                        stream.skipToEnd();
+                        return 'comment';
+                    }
+                    else if (stream.eat('*')) {
+                        state.tokenize = tokenComment;
+                        return tokenComment(stream, state);
+                    }
+                }
+                return '';
+            case '"': {
+                state.wb = true;
+                let escaped = false, next = stream.next();
+                while (next) {
+                    if (!escaped && next === '"') {
+                        break;
+                    }
+                    escaped = !escaped && next === '\\';
+                    next = stream.next();
+                }
+                return stream.match(/^\s*:/u, false) ? 'propertyName.definition' : 'string';
+            }
+            case '-':
+                if (state.wb) {
+                    return tokenNumber(stream, state);
+                }
+                state.wb = true;
+                return '';
+            default:
+                if (state.wb) {
+                    if (ch >= '0' && ch <= '9') {
+                        stream.backUp(1);
+                        return tokenNumber(stream, state);
+                    }
+                    else if (ch === 'n' && stream.match(/^ull\b/u)) {
+                        state.wb = false;
+                        return 'null';
+                    }
+                    else if (ch === 't' && stream.match(/^rue\b/u)
+                        || ch === 'f' && stream.match(/^alse\b/u)) {
+                        state.wb = false;
+                        return 'bool';
+                    }
+                }
+                state.wb = !/[\w$]/u.test(ch);
+                return '';
+        }
+    };
+    // Interface
+    return {
+        startState() {
+            return {
+                tokenize: tokenBase,
+                wb: true,
+            };
+        },
+        token(stream, state) {
+            if (stream.sol()) {
+                state.wb = true;
+            }
+            return state.tokenize(stream, state);
+        },
+    };
+};
+export const jsonBasic = mkJson(), jsonc = mkJson(true);

package/dist/keymap.d.ts

@@ -9,6 +9,6 @@ import type { KeymapConfig } from './keybindings';
  * @param opt.splitlines 是否分行
  * @test
  */
-export declare const getKeymap: ({ key, pre, post, splitlines }: KeymapConfig) => KeyBinding;
+export declare const getWikiKeymap: ({ key, pre, post, splitlines }: KeymapConfig) => KeyBinding;
 declare const _default: KeyBinding[];
 export default _default;