@bhsd/codemirror-mediawiki 3.12.0 → 3.12.2

package/dist/keymap.js

@@ -1,5 +1,7 @@
 import { EditorSelection } from '@codemirror/state';
+import { syntaxTree } from '@codemirror/language';
 import { keybindings, encapsulateLines } from './keybindings.js';
+const reKartographer = /(?:^|_)mw-tag-map(?:link|frame)(?:$|_)/u;
 /**
  * 生成keymap
  * @param opt 快捷键设置
@@ -9,11 +11,24 @@ import { keybindings, encapsulateLines } from './keybindings.js';
  * @param opt.splitlines 是否分行
  * @test
  */
-export const getKeymap = ({ key, pre = '', post = '', splitlines }) => ({
+export const getWikiKeymap = ({ key, pre = '', post = '', splitlines }) => ({
     key,
     run(view) {
-        const { state } = view;
+        const { state } = view, tree = syntaxTree(state);
         view.dispatch(state.changeByRange(({ from, to }) => {
+            if (key === 'Mod-/'
+                && reKartographer.test(tree.resolveInner(from, 1).name)
+                && reKartographer.test(tree.resolveInner(to, -1).name)) {
+                // JSONC comment
+                if (from === to) {
+                    pre = '//';
+                    post = '';
+                }
+                else {
+                    pre = '/*';
+                    post = '*/';
+                }
+            }
             if (splitlines) {
                 const start = state.doc.lineAt(from).from, end = state.doc.lineAt(to).to, insert = encapsulateLines(state.sliceDoc(start, end), pre, post);
                 return {
@@ -31,4 +46,4 @@ export const getKeymap = ({ key, pre = '', post = '', splitlines }) => ({
     },
     preventDefault: true,
 });
-export default keybindings.map(getKeymap);
+export default keybindings.map(getWikiKeymap);

package/dist/lint.js

@@ -1,4 +1,4 @@
-const findDiagnostic = (deco, head, anchor = head) => {
+const myFindDiagnostic = (deco, head, anchor = head) => {
     let found;
     deco.between(head, Infinity, (_, __, { spec: { diagnostics } }) => {
         const next = diagnostics.sort((a, b) => a.from - b.from || a.to - b.to)
@@ -16,7 +16,7 @@ const findDiagnostic = (deco, head, anchor = head) => {
  * @param cm CodeMirror6 实例
  */
 export const nextDiagnostic = (cm) => {
-    const view = cm.view, { state } = view, { diagnostics } = state.field(cm.getLintExtension()[2][0]), { from, to } = state.selection.main, next = findDiagnostic(diagnostics, from, to) ?? findDiagnostic(diagnostics, 0);
+    const view = cm.view, { state } = view, { diagnostics } = state.field(cm.getLintExtension()[2][0]), { from, to } = state.selection.main, next = myFindDiagnostic(diagnostics, from, to) ?? myFindDiagnostic(diagnostics, 0);
     if (!next || next.from === from && next.to === to) {
         return false;
     }

package/dist/lintsource.js

@@ -4,7 +4,7 @@ import { javascriptLanguage } from '@codemirror/lang-javascript';
 import { sanitizeInlineStyle, lintJSON } from '@bhsd/common';
 import { getWikiLinter, getJsLinter, getCssLinter, getLuaLinter, stylelintRepo, eslintRepo, luacheckRepo, isStylelintConfig, } from './linter.js';
 import { posToIndex, toConfigGetter, } from './util.js';
-import { base } from './constants.js';
+import { baseData } from './constants.js';
 import { vue } from './javascript-globals.js';
 /**
  * 获取Linter选项
@@ -67,7 +67,7 @@ const wikiLintSource = async (wikiLint, text, opt, doc, f = 0, t) => (await wiki
  * @test
  */
 export const getWikiLintSource = (articlePath) => async (opt, v) => {
-    const options = { ...await getOpt(opt), cdn: base.CDN };
+    const options = { ...await getOpt(opt), cdn: baseData.CDN };
     if (articlePath) {
         options.getConfig = toConfigGetter(options.getConfig, articlePath);
     }
@@ -113,7 +113,7 @@ const jsLintSource = (esLint, code, opt, doc, f = 0, t) => esLint(code, opt)
  * @test
  */
 export const getJsLintSource = async (opt) => {
-    const { CDN } = base, esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
+    const { CDN } = baseData, esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
     const lintSource = async ({ doc }) => jsLintSource(esLint, doc.toString(), await getOpt(opt), doc);
     lintSource.fixer = (doc, rule) => esLint.fixer(doc.toString(), rule);
     Object.defineProperty(lintSource, 'config', {
@@ -156,7 +156,7 @@ const cssLintSource = async (styleLint, code, opt, doc, f = 0, t) => {
  * @test
  */
 export const getCssLintSource = async (opt) => {
-    const { CDN } = base, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`);
+    const { CDN } = baseData, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`);
     const lintSource = async ({ doc }) => cssLintSource(styleLint, doc.toString(), await getOpt(opt), doc);
     lintSource.fixer = async (doc, rule) => styleLint.fixer(doc.toString(), rule);
     Object.defineProperty(lintSource, 'config', {
@@ -180,7 +180,7 @@ const stylelintConfigVue = /* #__PURE__ */ (() => ({
 }))();
 /** @implements */
 const getVueOrHtmlLintSource = (rules, globals) => async (opt) => {
-    const { CDN } = base, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`), esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
+    const { CDN } = baseData, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`), esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
     const lintSource = async (state) => {
         const { doc } = state, option = await getOpt(opt, true) ?? {};
         let js = option['js'], css = option['css'];
@@ -228,7 +228,7 @@ export const getVueLintSource = /* #__PURE__ */ getVueOrHtmlLintSource(stylelint
  * @test
  */
 export const getHTMLLintSource = async (opt, view, language) => {
-    const vueLintSource = await getVueOrHtmlLintSource()(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt), cdn: base.CDN }, view);
+    const vueLintSource = await getVueOrHtmlLintSource()(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt), cdn: baseData.CDN }, view);
     const lintSource = async (state) => {
         const { doc } = state, option = await getOpt(opt, true) ?? {}, wiki = option['wiki'];
         return [
@@ -255,7 +255,7 @@ export const getJsonLintSource = () => ({ doc }) => lintJSON(doc.toString())
  * @test
  */
 export const getLuaLintSource = async () => {
-    const { CDN } = base, luaLint = await getLuaLinter(CDN && `${CDN}/${luacheckRepo}`);
+    const { CDN } = baseData, luaLint = await getLuaLinter(CDN && `${CDN}/${luacheckRepo}`);
     return async ({ doc }) => (await luaLint(doc.toString()))
         .map(({ line, column, end_column, msg: message, severity }) => ({
         source: 'Luacheck',

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',
@@ -217,7 +218,7 @@ const map = {
         },
         ext: 4,
     },
-}, builtin = ['false', 'nil', 'true'], builtins = builtin.map(label => ({ label, type: 'constant' })), tables = [
+}, luaBuiltin = ['false', 'nil', 'true'], luaBuiltins = luaBuiltin.map(label => ({ label, type: 'constant' })), tables = [
     '_G',
     ...Object.keys(globals),
 ].map(label => ({ label, type: 'namespace' })), constants = [
@@ -267,7 +268,7 @@ const map = {
     'do',
     'until',
     'goto',
-].map(label => ({ label, type: 'keyword' })), keywords = [
+].map(label => ({ label, type: 'keyword' })), luaKeywords = [
     ...[
         'if',
         'while',
@@ -305,14 +306,14 @@ const map = {
         detail: 'in loop',
         type: 'keyword',
     }),
-], types = new Set(['variableName', 'variableName.standard', 'keyword']), lang = StreamLanguage.define(lua);
+], excludedTypes = new Set(['variableName', 'variableName.standard', 'keyword']), lang = StreamLanguage.define(lua);
 /**
  * @implements
  * @test
  */
 const source = context => {
     const { state, pos } = context, node = syntaxTree(state).resolveInner(pos, -1);
-    if (!types.has(node.name)) {
+    if (!excludedTypes.has(node.name)) {
         return null;
     }
     const match = context.matchBefore(/(?:(?:^|\S|\.\.)\s+|^|[^\w\s]|\.\.)\w+$|\.{1,2}$/u);
@@ -381,7 +382,7 @@ const source = context => {
         case ',':
             return {
                 from,
-                options: [...builtins, ...constants, ...tables, ...unary],
+                options: [...luaBuiltins, ...constants, ...tables, ...unary],
                 validFor,
             };
         case '}':
@@ -396,7 +397,7 @@ const source = context => {
         case '':
             return {
                 from,
-                options: [...keywords, ...blocks, ...unary, ...constants, ...tables, ...builtins],
+                options: [...luaKeywords, ...blocks, ...unary, ...constants, ...tables, ...luaBuiltins],
                 validFor,
             };
         default:
@@ -405,9 +406,9 @@ const source = context => {
                 return {
                     from,
                     options: prevSibling?.name !== 'keyword'
-                        || builtin.includes(sliceDoc(state, prevSibling))
+                        || luaBuiltin.includes(sliceDoc(state, prevSibling))
                         ? [...binary, ...blocks]
-                        : [...builtins, ...constants, ...tables, ...unary, ...blocks],
+                        : [...luaBuiltins, ...constants, ...tables, ...unary, ...blocks],
                     validFor,
                 };
             }
@@ -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, 1);
+                        }
+                        // 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);