@bhsd/codemirror-mediawiki 3.11.5 → 3.12.1

package/dist/theme.d.ts

@@ -1,5 +1,5 @@
 import type { Extension } from '@codemirror/state';
-export declare const getLightHighlightStyle: () => Extension;
+export declare const lightHighlightStyle: Extension;
 export declare const light: Extension, 
 /**
  * @author 鬼影233

package/dist/theme.js

@@ -3,7 +3,7 @@ import { syntaxHighlighting, HighlightStyle, defaultHighlightStyle } from '@code
 import { nord as nordBase } from 'cm6-theme-nord';
 import { matchingCls, nonmatchingCls, actionSelector, panelsSelector, bgDark, } from './constants.js';
 const focused = '&.cm-focused', matching = `${focused} .${matchingCls}`, nonmatching = `${focused} .${nonmatchingCls}`;
-export const getLightHighlightStyle = () => syntaxHighlighting(HighlightStyle.define(defaultHighlightStyle.specs, { themeType: 'light' }));
+export const lightHighlightStyle = /* @__PURE__ */ (() => syntaxHighlighting(HighlightStyle.define(defaultHighlightStyle.specs, { themeType: 'light' })))();
 export const light = /* @__PURE__ */ EditorView.theme({
     '&': {
         backgroundColor: '#fff',
@@ -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.d.ts

@@ -153,7 +153,7 @@ export declare class MediaWiki {
      */
     registerGroundTokens(): void;
     inChars({ length }: string, tag: TagName): Tokenizer<string>;
-    inStr(str: string, tag: TagName | false, errorTag?: TagName): Tokenizer<string>;
+    inStr(str: string, tag: string | false, errorTag?: string): Tokenizer<string>;
     eatWikiText(style: string): Tokenizer;
     eatApostrophes(obj: Pick<State, 'bold' | 'italic'>): Tokenizer<string | false>;
     eatExternalLinkProtocol({ length }: string, free?: boolean): Tokenizer;
@@ -168,7 +168,7 @@ export declare class MediaWiki {
     inTableDefinition(tr?: boolean, quote?: string): Tokenizer;
     get inTable(): Tokenizer;
     inTableCell(style: string, needAttr?: boolean, firstLine?: boolean): Tokenizer;
-    inSectionHeader(str: string): Tokenizer;
+    inSectionHeader(str: string, level: number): Tokenizer;
     get inComment(): Tokenizer<string>;
     eatExtTag(tagname: string, isCloseTag: boolean, state: State): string;
     eatHtmlTag(tagname: string, isCloseTag: boolean, state: State): string;

package/dist/token.js

@@ -112,7 +112,8 @@ const startState = (tokenize, tags, urlProtocols, sof = false) => ({
  */
 const copyState = (state) => {
     const result = { ...state };
-    for (const [key, val] of Object.entries(state)) {
+    for (const key in result) { // eslint-disable-line guard-for-in
+        const val = result[key];
         if (Array.isArray(val)) {
             // @ts-expect-error initial value
             result[key] = [...val];
@@ -120,9 +121,9 @@ 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 };
+            result[key] = { ...val }; // eslint-disable-line @typescript-eslint/no-misused-spread
         }
     }
     return result;
@@ -261,6 +262,7 @@ export const makeLocalStyle = (style, state, endGround) => {
 const makeLocalTagStyle = (tag, state, endGround) => makeLocalStyle(tokens[tag], state, endGround);
 const makeStyle = (style, state, endGround) => [makeLocalStyle(style, state, endGround)];
 const makeTagStyle = (tag, state, endGround) => makeStyle(tokens[tag], state, endGround);
+const getTagStyle = (tag) => tag in tokens ? tokens[tag] : tag;
 /**
  * Remembers position and status for rollbacking.
  * It is needed for changing from bold to italic with apostrophes before it, if required.
@@ -576,21 +578,21 @@ let MediaWiki = (() => {
             };
         }
         inStr(str, tag, errorTag = 'error') {
+            tag &&= getTagStyle(tag);
+            errorTag = getTagStyle(errorTag);
             return (stream, state) => {
                 if (stream.match(str, Boolean(tag))) {
                     pop(state);
-                    return tag ? makeLocalTagStyle(tag, state) : '';
+                    return tag ? makeLocalStyle(tag, state) : '';
                 }
                 else if (!stream.skipTo(str)) {
                     stream.skipToEnd();
                 }
-                return makeLocalTagStyle(errorTag, state);
+                return makeLocalStyle(errorTag, state);
             };
         }
         eatWikiText(style) {
-            if (style in tokens) {
-                style = tokens[style];
-            }
+            style = getTagStyle(style);
             const regex = /^(?:(?:RFC|PMID)[\p{Zs}\t]+\d+|ISBN[\p{Zs}\t]+(?:97[89][\p{Zs}\t-]?)?(?:\d[\p{Zs}\t-]?){9}[\dxX])\b/u;
             return (stream, state) => {
                 let ch;
@@ -641,8 +643,9 @@ let MediaWiki = (() => {
                             // Title
                             if (tmp) {
                                 stream.backUp(tmp[2].length);
-                                chain(state, this.inSectionHeader(tmp[3]));
-                                return makeLocalStyle(`${tokens.sectionHeader} mw-section--${tmp[1].length + 1}`, state);
+                                const level = tmp[1].length + 1;
+                                chain(state, this.inSectionHeader(tmp[3], level));
+                                return makeLocalStyle(`${tokens.sectionHeader} mw-section--${level}`, state);
                             }
                             break;
                         }
@@ -1137,7 +1140,8 @@ let MediaWiki = (() => {
                     : this.eatWikiText(style)(stream, state);
             };
         }
-        inSectionHeader(str) {
+        inSectionHeader(str, level) {
+            const headerStyle = `${tokens.sectionHeader} mw-section--${level}`, style = `${tokens.section} mw-section--${level}`;
             return (stream, state) => {
                 if (stream.sol()) {
                     pop(state);
@@ -1146,16 +1150,16 @@ let MediaWiki = (() => {
                 else if (stream.match(headerRegex)) {
                     if (stream.eol()) {
                         stream.backUp(str.length);
-                        state.tokenize = this.inStr(str, 'sectionHeader');
+                        state.tokenize = this.inStr(str, headerStyle);
                     }
                     else if (stream.match(/^<!--(?!.*?-->.*?=)/u, false)) {
                         // T171074: handle trailing comments
                         stream.backUp(str.length);
-                        state.tokenize = this.inStr('<!--', false, 'sectionHeader');
+                        state.tokenize = this.inStr('<!--', false, headerStyle);
                     }
-                    return makeLocalTagStyle('section', state);
+                    return makeLocalStyle(style, state);
                 }
-                return this.eatWikiText('section')(stream, state);
+                return this.eatWikiText(style)(stream, state);
             };
         }
         get inComment() {
@@ -1734,8 +1738,13 @@ let MediaWiki = (() => {
                     stream.pos === oldToken?.pos
                         && stream.string === oldToken.string
                         && cmpNesting(state, oldToken.state)) {
-                        const { pos, string, state: { bold, italic, ...other }, style } = readyTokens[0];
-                        Object.assign(state, other);
+                        const { pos, string, state: other, style } = readyTokens[0];
+                        for (const key in other) {
+                            if (key !== 'bold' && key !== 'italic') {
+                                // @ts-expect-error assign readonly properties
+                                state[key] = other[key];
+                            }
+                        }
                         if (!(state.extName && state.extMode)
                             && state.nLink === 0
                             && typeof style === 'string'

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),
     ]),
 });