@bhsd/codemirror-mediawiki 3.12.0 → 3.12.1

package/dist/theme.js

@@ -30,6 +30,12 @@ export const light = /* @__PURE__ */ EditorView.theme({
     '.cm-globals, .cm-globals>*': {
         color: '#164',
     },
+    '.cm-doctag>*': {
+        color: '#219',
+    },
+    '.cm-doctag-type>*': {
+        color: '#085',
+    },
     [matching]: {
         backgroundColor: 'rgb(50,140,130,.32)',
     },
@@ -69,6 +75,12 @@ nord = /* @__PURE__ */ (() => [
         '.cm-globals, .cm-globals>*': {
             color: '#d08770',
         },
+        '.cm-doctag>*': {
+            color: '#81a1c1',
+        },
+        '.cm-doctag-type>*': {
+            color: '#ebcb8b',
+        },
         'div.cm-activeLine': {
             backgroundColor: 'rgb(76,86,106,.27)',
         },

package/dist/token.js

@@ -121,7 +121,7 @@ const copyState = (state) => {
         else if (key === 'extState') {
             result[key] = (state.extName && state.extMode && state.extMode.copyState || copyState)(val);
         }
-        else if (key !== 'data' && val && typeof val === 'object') {
+        else if (key !== 'data' && key !== 'extMode' && val && typeof val === 'object') {
             // @ts-expect-error initial value
             result[key] = { ...val }; // eslint-disable-line @typescript-eslint/no-misused-spread
         }

package/dist/util.d.ts

@@ -1,8 +1,9 @@
-import type { EditorView, TooltipView } from '@codemirror/view';
-import type { Text, EditorState, SelectionRange } from '@codemirror/state';
+import type { EditorView, TooltipView, Decoration } from '@codemirror/view';
+import type { Text, EditorState, SelectionRange, Range } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
 import type { Position } from 'vscode-languageserver-types';
 import type { ConfigGetter } from '@bhsd/browser';
+import type { DocRange } from './fold';
 /**
  * 转义HTML字符串
  * @param text 原字符串
@@ -37,12 +38,28 @@ export declare const createTooltipView: (view: EditorView, innerHTML: string) =>
  */
 export declare const sliceDoc: (state: EditorState, node: SyntaxNode | SelectionRange) => string;
 /**
- * Update the stack of opening (+) or closing (-) brackets
+ * Update the stack of opening (+) or closing (-) braces
  * @param state
  * @param node 语法树节点
  * @test
  */
 export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) => [number, number];
+/**
+ * Push a decoration to the array if the range is not empty
+ * @param decorations Decoration 数组
+ * @param decoration Decoration 实例
+ * @param from 起始位置或节点
+ * @param to 结束位置
+ */
+export declare const pushDecoration: (decorations: Range<Decoration>[], decoration: Decoration, from: number | DocRange, to?: number) => void;
+/**
+ * Mark the type in a JSDoc/LDoc comment
+ * @param decorations
+ * @param from 起始位置
+ * @param mt 正则表达式匹配结果，第1个捕获组为标签，第2个捕获组为类型的起始括号`{`
+ * @test
+ */
+export declare const markDocTagType: (decorations: Range<Decoration>[], from: number, mt: RegExpExecArray) => Range<Decoration>[];
 /**
  * Check if the node is a template parameter value
  * @param node 语法树节点

package/dist/util.js

@@ -1,6 +1,6 @@
 import elt from 'crelt';
 import { tokens } from './config.js';
-import { hoverSelector, } from './constants.js';
+import { hoverSelector, doctagMark, typeMark, } from './constants.js';
 const dict = { '\n': '<br>', '&': '&amp;', '<': '&lt;' };
 /**
  * 转义HTML字符串
@@ -47,7 +47,7 @@ export const createTooltipView = (view, innerHTML) => {
  */
 export const sliceDoc = (state, node) => state.sliceDoc(node.from, node.to);
 /**
- * Update the stack of opening (+) or closing (-) brackets
+ * Update the stack of opening (+) or closing (-) braces
  * @param state
  * @param node 语法树节点
  * @test
@@ -56,6 +56,46 @@ export const braceStackUpdate = (state, node) => {
     const brackets = sliceDoc(state, node);
     return [brackets.split('{{').length - 1, 1 - brackets.split('}}').length];
 };
+/**
+ * Push a decoration to the array if the range is not empty
+ * @param decorations Decoration 数组
+ * @param decoration Decoration 实例
+ * @param from 起始位置或节点
+ * @param to 结束位置
+ */
+export const pushDecoration = (decorations, decoration, from, to) => {
+    if (typeof from !== 'number') {
+        ({ from, to } = from);
+    }
+    if (from < to) {
+        decorations.push(decoration.range(from, to));
+    }
+};
+/**
+ * Mark the type in a JSDoc/LDoc comment
+ * @param decorations
+ * @param from 起始位置
+ * @param mt 正则表达式匹配结果，第1个捕获组为标签，第2个捕获组为类型的起始括号`{`
+ * @test
+ */
+export const markDocTagType = (decorations, from, mt) => {
+    const { input, indices } = mt, [start, end] = indices[1];
+    pushDecoration(decorations, doctagMark, from + start, from + end);
+    if (mt[2]) {
+        const re = /[{}]/gu, [, left] = indices[2];
+        re.lastIndex = left;
+        let m = re.exec(input), balance = 1;
+        while (m) {
+            balance += m[0] === '{' ? 1 : -1;
+            if (balance === 0) {
+                pushDecoration(decorations, typeMark, from + left, from + m.index);
+                break;
+            }
+            m = re.exec(input);
+        }
+    }
+    return decorations;
+};
 /**
  * Check if the node is a template parameter value
  * @param node 语法树节点

package/dist/vue.js

@@ -3,13 +3,13 @@ import { htmlLanguage, htmlCompletionSource } from '@codemirror/lang-html';
 import { javascript } from '@codemirror/lang-javascript';
 import { LanguageSupport } from '@codemirror/language';
 import { cssCompletion } from './css.js';
-import { jsCompletion, markGlobalsPlugin } from './javascript.js';
+import { jsCompletion, markGlobalsAndDocTagPlugin } from './javascript.js';
 export default (_, cm) => vue({
     base: new LanguageSupport(htmlLanguage, [
         htmlLanguage.data.of({ autocomplete: htmlCompletionSource }),
         javascript().support,
         jsCompletion,
         cssCompletion(),
-        markGlobalsPlugin(cm),
+        markGlobalsAndDocTagPlugin(cm),
     ]),
 });