@bhsd/codemirror-mediawiki 3.12.2 → 3.12.3

package/dist/codemirror.d.ts

@@ -4,7 +4,8 @@ import type { Extension, StateField } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
 import type { ConfigGetter } from '@bhsd/browser';
 import type { ConfigData } from 'wikiparser-node';
-import type { DocRange, foldHandler } from './fold';
+import type { foldHandler } from './fold';
+import type { DocRange } from './util';
 import type { detectIndent } from './indent';
 import type { Option, LiveOption } from './linter';
 import type { LintSource, LintSources, LintSourceGetter } from './lintsource';

package/dist/constants.d.ts

@@ -1,4 +1,5 @@
 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";
+import type { Completion } from '@codemirror/autocomplete';
+export declare const baseData: Record<'CDN', string | undefined>, extData: Record<string, Set<string>>, extCompletion: Record<string, Completion[]>, 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,6 +1,6 @@
 import { Decoration } from '@codemirror/view';
 import { wmf } from '@bhsd/common';
-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 baseData = { CDN: undefined }, extData = {}, extCompletion = {}, 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/css.js

@@ -1,7 +1,7 @@
 import { cssLanguage, cssCompletionSource } from '@codemirror/lang-css';
 import { LanguageSupport, syntaxTree } from '@codemirror/language';
-import { sliceDoc } from './util.js';
-const cssWideKeywords = /* @__PURE__ */ (() => ['revert', 'revert-layer'].map((label) => ({ label, type: 'keyword' })))();
+import { sliceDoc, getCompletions } from './util.js';
+const cssWideKeywords = /* @__PURE__ */ getCompletions(['revert', 'revert-layer']);
 /**
  * CSS completion source with dialect-specific adjustments.
  * @param dialect 是否是sanitized-css

package/dist/escape.js

@@ -60,13 +60,12 @@ escapeWiki = async (view, lsp) => {
     }
     view.dispatch(state.changeByRange(range => {
         const insert = replacements.get(range);
-        if (insert === undefined) {
-            return { range };
-        }
-        return {
-            range: EditorSelection.range(range.from, range.from + insert.length),
-            changes: { from: range.from, to: range.to, insert },
-        };
+        return insert === undefined
+            ? { range }
+            : {
+                range: EditorSelection.range(range.from, range.from + insert.length),
+                changes: { from: range.from, to: range.to, insert },
+            };
     }));
 };
 const escapeWikiCommand = (view, getConfig) => {

package/dist/fold.d.ts

@@ -3,10 +3,7 @@ import { RangeSet } from '@codemirror/state';
 import type { BlockInfo, Command } from '@codemirror/view';
 import type { EditorState, StateEffect, Extension } from '@codemirror/state';
 import type { SyntaxNode, Tree } from '@lezer/common';
-export interface DocRange {
-    from: number;
-    to: number;
-}
+import type { DocRange } from './util';
 declare type AnchorUpdate = (pos: number, range: DocRange) => number;
 export declare const updateSelection: AnchorUpdate, updateAll: AnchorUpdate;
 /**

package/dist/javascript.d.ts

@@ -1,7 +1,7 @@
 import type { Extension, EditorState } from '@codemirror/state';
 import type { DecorationSet } from '@codemirror/view';
 import type { Tree } from '@lezer/common';
-import type { DocRange } from './fold';
+import type { DocRange } from './util';
 import type { CodeMirror6 } from './codemirror';
 export declare const jsCompletion: Extension;
 /**

package/dist/json.js

@@ -1,25 +1,15 @@
-const tokenNumber = (stream, state) => {
+import { inComment } from './util.js';
+const eatNumber = (stream, state) => {
     if (stream.match(/^\d+(?:\.\d+)?(?:e[+-]?\d+)?/iu)) {
         state.wb = false;
-        return 'number';
+        return /* #164 */ '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) => {
+    const inBase = (stream, state) => {
         if (stream.eatSpace()) {
             state.wb = true;
             return '';
@@ -43,11 +33,11 @@ const mkJson = (jsoncMode) => {
                 if (jsoncMode) {
                     if (stream.eat('/')) {
                         stream.skipToEnd();
-                        return 'comment';
+                        return /* #940 */ 'comment';
                     }
                     else if (stream.eat('*')) {
-                        state.tokenize = tokenComment;
-                        return tokenComment(stream, state);
+                        state.tokenize = inJsoncComment;
+                        return 'comment';
                     }
                 }
                 return '';
@@ -61,39 +51,42 @@ const mkJson = (jsoncMode) => {
                     escaped = !escaped && next === '\\';
                     next = stream.next();
                 }
-                return stream.match(/^\s*:/u, false) ? 'propertyName.definition' : 'string';
+                return stream.match(/^\s*:/u, false)
+                    ? /* #00c */ 'propertyName.definition'
+                    : /* #a11 */ 'string';
             }
             case '-':
                 if (state.wb) {
-                    return tokenNumber(stream, state);
+                    return eatNumber(stream, state);
                 }
                 state.wb = true;
                 return '';
             default:
                 if (state.wb) {
-                    if (ch >= '0' && ch <= '9') {
+                    if (/\d/u.test(ch)) {
                         stream.backUp(1);
-                        return tokenNumber(stream, state);
+                        return eatNumber(stream, state);
                     }
                     else if (ch === 'n' && stream.match(/^ull\b/u)) {
                         state.wb = false;
-                        return 'null';
+                        return /* #708 */ 'null';
                     }
                     else if (ch === 't' && stream.match(/^rue\b/u)
                         || ch === 'f' && stream.match(/^alse\b/u)) {
                         state.wb = false;
-                        return 'bool';
+                        return /* #219 */ 'bool';
                     }
                 }
                 state.wb = !/[\w$]/u.test(ch);
                 return '';
         }
     };
+    const inJsoncComment = inComment(inBase, '*/');
     // Interface
     return {
         startState() {
             return {
-                tokenize: tokenBase,
+                tokenize: inBase,
                 wb: true,
             };
         },

package/dist/keymap.d.ts

@@ -1,5 +1,12 @@
 import type { KeyBinding } from '@codemirror/view';
+import type { EditorState } from '@codemirror/state';
+import type { Tree } from '@lezer/common';
 import type { KeymapConfig } from './keybindings';
+/**
+ * @ignore
+ * @test
+ */
+export declare const getExtNames: (state: EditorState, tree: Tree, pos: number, side: 1 | -1) => string[];
 /**
  * 生成keymap
  * @param opt 快捷键设置

package/dist/keymap.js

@@ -1,7 +1,50 @@
 import { EditorSelection } from '@codemirror/state';
 import { syntaxTree } from '@codemirror/language';
 import { keybindings, encapsulateLines } from './keybindings.js';
-const reKartographer = /(?:^|_)mw-tag-map(?:link|frame)(?:$|_)/u;
+import { getTag } from './matchTag.js';
+import { sliceDoc, getExtTags } from './util.js';
+/**
+ * @ignore
+ * @test
+ */
+export const getExtNames = (state, tree, pos, side) => {
+    const node = tree.resolveInner(pos, side), { name } = node;
+    if (name === 'Document') {
+        const { doc } = state, end = side === 1 ? 'to' : 'from';
+        let line = doc.lineAt(pos);
+        if (line[end] === pos) {
+            const { lines } = doc;
+            for (let { number } = line; number > 0 && number <= lines; number -= side) {
+                line = doc.line(number);
+                if (line.length > 0) {
+                    return getExtNames(state, tree, line[end], -side);
+                }
+            }
+        }
+        return [];
+    }
+    const ext = name.includes('mw-tag-') ? getExtTags(name.split('_')) : [];
+    if (name.includes('mw-exttag-bracket')) {
+        const bracket = sliceDoc(state, node), { from } = node;
+        // `<score>`、`<maplink>`和`<mapfram>`内部均不可包含其他扩展标签，所以可以省略一些情形
+        if (side === 1 ? bracket === '</' && from === pos : bracket === '>') {
+            // 在扩展标签旁，如 `・</score>` 或 `<maplink>・`
+            const sibling = node[side === 1 ? 'nextSibling' : 'prevSibling'], tag = sibling && getTag(state, sibling);
+            if (tag && (side === 1 || !tag.closing)) {
+                ext.push(tag.name);
+            }
+        }
+        else if (bracket === '></' && from + 1 === pos) {
+            // 扩展标签内尚无内容，如 `<score>・</score>`
+            const { prevSibling } = node, tag = prevSibling && getTag(state, prevSibling);
+            if (tag) {
+                ext.push(tag.name);
+            }
+        }
+    }
+    return ext;
+};
+const isExtRange = (from, to, empty, names) => names.some(name => empty ? from.includes(name) || to.includes(name) : from.includes(name) && to.includes(name));
 /**
  * 生成keymap
  * @param opt 快捷键设置
@@ -15,30 +58,54 @@ export const getWikiKeymap = ({ key, pre = '', post = '', splitlines }) => ({
     key,
     run(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 = '';
+        view.dispatch(state.changeByRange(({ from, to, empty }) => {
+            let before = pre, after = post;
+            if (key === 'Mod-/') {
+                const fromExt = getExtNames(state, tree, from, 1), toExt = getExtNames(state, tree, to, -1);
+                if (isExtRange(fromExt, toExt, empty, ['maplink', 'mapframe'])) {
+                    // JSONC comment
+                    if (empty) {
+                        before = '//';
+                        after = '';
+                    }
+                    else {
+                        before = '/* ';
+                        after = ' */';
+                    }
+                }
+                else if (isExtRange(fromExt, toExt, empty, ['score-scheme'])) {
+                    // LilyPond scheme comment
+                    if (empty) {
+                        before = ';';
+                        after = '';
+                    }
+                    else {
+                        before = '#! ';
+                        after = ' !#';
+                    }
                 }
-                else {
-                    pre = '/*';
-                    post = '*/';
+                else if (isExtRange(fromExt, toExt, empty, ['score'])) {
+                    // LilyPond comment
+                    if (empty) {
+                        before = '%';
+                        after = '';
+                    }
+                    else {
+                        before = '%{ ';
+                        after = ' %}';
+                    }
                 }
             }
             if (splitlines) {
-                const start = state.doc.lineAt(from).from, end = state.doc.lineAt(to).to, insert = encapsulateLines(state.sliceDoc(start, end), pre, post);
+                const start = state.doc.lineAt(from).from, end = state.doc.lineAt(to).to, insert = encapsulateLines(state.sliceDoc(start, end), before, after);
                 return {
                     range: EditorSelection.range(start, start + insert.length),
                     changes: { from: start, to: end, insert },
                 };
             }
-            const insert = pre + state.sliceDoc(from, to) + post, head = from + insert.length;
+            const insert = before + state.sliceDoc(from, to) + after, head = from + insert.length;
             return {
-                range: EditorSelection.cursor(from === to ? from + pre.length : head),
+                range: EditorSelection.cursor(empty ? from + before.length : head),
                 changes: { from, to, insert },
             };
         }));

package/dist/lilypond.d.ts

@@ -0,0 +1,14 @@
+import type { StreamParser, StringStream } from '@codemirror/language';
+declare interface State {
+    tokenize: Tokenizer;
+    /** 只用于Scheme */
+    parens: number;
+    /** 只用于歌词 */
+    braces: number;
+    /** 只用于歌词 */
+    spaced: boolean;
+    lyrics: boolean;
+}
+declare type Tokenizer = (stream: StringStream, state: State) => string;
+export declare const lilypond: StreamParser<State>;
+export {};

package/dist/lilypond.js

@@ -0,0 +1,240 @@
+import { inComment, getCompletions } from './util.js';
+import { extData, extCompletion } from './constants.js';
+let scoreFetch;
+const inString = (parent) => (stream, state) => {
+    let escaped = false, next = stream.next();
+    while (next) {
+        if (!escaped && next === '"') {
+            state.tokenize = parent;
+            return /* #a11 */ 'string';
+        }
+        escaped = !escaped && next === '\\';
+        next = stream.next();
+    }
+    return /* #a11 */ 'string';
+};
+const inScheme = (parent) => {
+    const style = 'mw-tag-score-scheme';
+    const tokenizer = (stream, state) => {
+        if (stream.eatSpace()) {
+            return style;
+        }
+        const ch = stream.next();
+        switch (ch) {
+            case '(':
+                state.parens++;
+                return style;
+            case ')':
+                state.parens--;
+                if (state.parens === 0) {
+                    state.tokenize = parent;
+                    return 'separator';
+                }
+                return style;
+            case '"':
+                state.tokenize = inString(tokenizer);
+                return /* #a11 */ `string ${style}`;
+            case ';':
+                stream.skipToEnd();
+                return /* #940 */ `comment ${style}`;
+            case '#':
+                if (stream.eat('!')) {
+                    state.tokenize = inComment(tokenizer, '!#');
+                    return /* #940 */ `comment ${style}`;
+                }
+            // fall through
+            default:
+                return style;
+        }
+    };
+    return tokenizer;
+};
+const eatHash = (stream, state, ch, parent) => {
+    if (stream.match(/^#[tf]/u)) {
+        return /* #219 */ 'bool';
+    }
+    else if (ch === '#' && stream.match(/^(?:\d+|#x[\da-f]*)/iu)) {
+        return /* #a11 */ 'character';
+    }
+    else if (stream.eat('(')) {
+        state.tokenize = inScheme(parent);
+        state.parens = 1;
+        return 'separator';
+    }
+    return stream.match(/^\s*[-_a-z][-\w]*/iu) ? 'variableName.local' : 'operator';
+};
+const eatQuote = (state, parent) => {
+    state.tokenize = inString(parent);
+    return /* #a11 */ 'string';
+};
+const eatPercent = (stream, state, parent) => {
+    if (stream.eat('{')) {
+        state.tokenize = inComment(parent, '%}');
+        return /* #940 */ 'comment';
+    }
+    stream.skipToEnd();
+    return /* #940 */ 'comment';
+};
+const lyricsCommands = new Set(['addlyrics', 'lyricmode', 'lyrics', 'lyricsto']), setCommands = new Set(['set', 'override']), unsetCommands = new Set(['unset', 'revert', 'tweak']), newCommands = new Set(['new', 'context']);
+const eatCommand = (stream, state, parent, base) => {
+    const mt = stream.match(/^[a-z](?:[a-z]|-+(?=[a-z]))*/iu), cmd = mt?.[0], isUnset = unsetCommands.has(cmd), isNew = newCommands.has(cmd);
+    if (base && lyricsCommands.has(cmd)) {
+        state.lyrics = true;
+    }
+    else if (isUnset || isNew || setCommands.has(cmd)) {
+        state.tokenize = inAssignment(parent, isUnset ? -1 : 1, isNew);
+    }
+    return mt && extData['score']?.has(`\\${cmd}`) !== false ? /* #708 */ 'keyword' : '';
+};
+const inAssignment = (parent, step, cls) => (stream, state) => {
+    if (stream.eatSpace()) {
+        return '';
+    }
+    else if (step === 0) {
+        stream.eat('=');
+        state.tokenize = parent;
+        return 'operator';
+    }
+    stream.match(/^[a-z][-\w.]*/iu);
+    state.tokenize = step === 1 ? inAssignment(parent, 0) : parent;
+    return cls ? /* #167 */ 'className' : /* #00f */ 'variableName.definition';
+};
+const inBase = (stream, state) => {
+    if (stream.eatSpace()) {
+        return '';
+    }
+    const ch = stream.next();
+    switch (ch) {
+        case '-':
+            return stream.eat(/[->.+_!^]/u) ? 'operator' : 'punctuation';
+        case '#':
+        case '$':
+            return eatHash(stream, state, ch, inBase);
+        case '"':
+            return eatQuote(state, inBase);
+        case '%':
+            return eatPercent(stream, state, inBase);
+        case '/':
+            stream.eat('+');
+            return 'punctuation';
+        case '\\':
+            if (stream.eat(/[-<>!]/u)) {
+                return 'operator';
+            }
+            else if (stream.eat(/[()[\]]/u)) {
+                return 'squareBracket';
+            }
+            return stream.eat(/[\\=]/u) ? 'punctuation' : eatCommand(stream, state, inBase, true);
+        case '}':
+            state.lyrics = false;
+            return 'squareBracket';
+        case '{':
+            if (state.lyrics) {
+                state.lyrics = false;
+                state.braces = 1;
+                state.spaced = true;
+                state.tokenize = inLyrics;
+            }
+            return 'squareBracket';
+        default:
+            if (/[<>()[\]]/u.test(ch)) {
+                return 'squareBracket';
+            }
+            else if (/[:|~^_=]/u.test(ch)) {
+                return 'punctuation';
+            }
+            else if (/[',.!?]/u.test(ch)) {
+                return 'operator';
+            }
+            else if (/\d/u.test(ch)) {
+                stream.match(/^\d*(?:[./]\d+)?/u);
+                return /* #164 */ 'number';
+            }
+            else if (/[a-z]/iu.test(ch)) {
+                stream.match(/^(?:[a-z]|[-_\d]+(?=[a-z]))+/iu);
+                return /^(?:[rs]|[a-g](?:is)*(?:ih)*|[a-g]?(?:es)*(?:eh)*)$/u.test(stream.current())
+                    ? ''
+                    : /* #219 */ 'atom';
+            }
+            return '';
+    }
+};
+const inLyrics = (stream, state) => {
+    if (stream.eatSpace()) {
+        state.spaced = true;
+        return '';
+    }
+    else if (stream.sol()) {
+        state.spaced = true;
+    }
+    const ch = stream.next();
+    switch (ch) {
+        case '-':
+            if (state.spaced && stream.match(/^-(?=\s)/u)) {
+                return 'punctuation';
+            }
+            state.spaced = false;
+            return 'string';
+        case '_':
+        case '~':
+        case '|':
+            state.spaced = false;
+            return 'punctuation';
+        case '#':
+        case '$':
+            state.spaced = false;
+            return eatHash(stream, state, ch, inLyrics);
+        case '"':
+            state.spaced = true;
+            return eatQuote(state, inLyrics);
+        case '%':
+            state.spaced = true;
+            return eatPercent(stream, state, inLyrics);
+        case '\\':
+            if (stream.eat(/[<>!\\]/u)) {
+                state.spaced = true;
+                return '';
+            }
+            state.spaced = false;
+            return eatCommand(stream, state, inLyrics);
+        case '{':
+        case '}':
+            state.braces += ch === '{' ? 1 : -1;
+            if (state.braces) {
+                state.spaced = true;
+            }
+            else {
+                state.tokenize = inBase;
+            }
+            return 'squareBracket';
+        default:
+            state.spaced = false;
+            if (/\d/u.test(ch)) {
+                stream.eatWhile(/\d/u);
+                return /* #164 */ 'number';
+            }
+            stream.eatWhile(/[^\s\d_~{}#$"%\\]/u);
+            return /* #a11 */ 'string';
+    }
+};
+export const lilypond = {
+    startState() {
+        if (typeof wikiparse === 'object') {
+            scoreFetch ??= (async () => {
+                const data = await (await fetch(`${wikiparse.CDN}/data/ext/score.json`)).json();
+                extData['score'] = new Set(data.flatMap(item => item.split('.')));
+                extCompletion['score'] = getCompletions(data.filter(s => s.startsWith('\\')), 'keyword');
+            })();
+        }
+        return {
+            tokenize: inBase,
+            parens: 0,
+            braces: 0,
+            lyrics: false,
+            spaced: false,
+        };
+    },
+    token(stream, state) {
+        return state.tokenize(stream, state);
+    },
+};

package/dist/lintsource.d.ts

@@ -3,7 +3,7 @@ import type { Text, EditorState } from '@codemirror/state';
 import type { Language } from '@codemirror/language';
 import type { Diagnostic, Action } from '@codemirror/lint';
 import type { Option, LiveOption } from './linter';
-import type { DocRange } from './fold';
+import type { DocRange } from './util';
 export type LintSource<T = unknown> = ((state: EditorState) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>) & {
     config?: T;
     fixer?: (doc: Text, rule?: string) => string | Promise<string>;

package/dist/lua.d.ts

@@ -3,7 +3,7 @@ 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';
+import type { DocRange } from './util';
 /**
  * 高亮显示LDoc标签
  * @ignore