@bhsd/codemirror-mediawiki 3.11.5 → 3.12.1

package/dist/matchBrackets.d.ts

@@ -1,3 +1,4 @@
+import type { DecorationSet } from '@codemirror/view';
 import type { Extension, EditorState } from '@codemirror/state';
 import type { Config, MatchResult } from '@codemirror/language';
 import type { SyntaxNode } from '@lezer/common';
@@ -5,6 +6,10 @@ export interface Selection {
     anchor: number;
     head: number;
 }
+export interface BracketConfig extends Config {
+    exclude?: (state: EditorState, pos: number) => boolean;
+}
+export type RequiredConfig = Required<Config> & BracketConfig;
 /**
  * @ignore
  * @test
@@ -25,5 +30,15 @@ export declare const trySelectMatchingBrackets: (state: EditorState, pos: number
  * @test
  */
 export declare const selectMatchingBrackets: (state: EditorState, pos: number, config?: Config) => Selection | false;
-declare const _default: (configs?: Config) => Extension;
+/**
+ * @ignore
+ * @test
+ */
+export declare const selectLineBlock: (state: EditorState, pos: number, config?: Config) => Selection | false;
+/**
+ * @ignore
+ * @test
+ */
+export declare const bracketDeco: (state: EditorState, config: RequiredConfig) => DecorationSet;
+declare const _default: (configs?: BracketConfig) => Extension;
 export default _default;

package/dist/matchBrackets.js

@@ -1,4 +1,4 @@
-import { Decoration, EditorView } from '@codemirror/view';
+import { Decoration, EditorView, ViewPlugin } from '@codemirror/view';
 import { bracketMatching, matchBrackets, syntaxTree } from '@codemirror/language';
 /**
  * @ignore
@@ -56,50 +56,98 @@ export const selectMatchingBrackets = (state, pos, config) => trySelectMatchingB
     || trySelectMatchingBrackets(state, pos, 1, config)
     || trySelectMatchingBrackets(state, pos + 1, -1, config, true)
     || trySelectMatchingBrackets(state, pos - 1, 1, config, true);
+const tryMatchBracetks = (state, pos, config) => matchBrackets(state, pos, -1, config)
+    || pos > 0 && matchBrackets(state, pos - 1, 1, config)
+    || config.afterCursor && (matchBrackets(state, pos, 1, config)
+        || pos < state.doc.length && matchBrackets(state, pos + 1, -1, config));
+/**
+ * @ignore
+ * @test
+ */
+export const selectLineBlock = (state, pos, config) => {
+    const { doc } = state, matching = tryMatchBracetks(state, pos, { ...config, afterCursor: true });
+    if (!matching || !matching.matched) {
+        return false;
+    }
+    const { start, end } = matching, a = doc.lineAt(start.from), b = doc.lineAt(end.from), dir = a.from < b.from;
+    return {
+        anchor: (dir ? a : b).from,
+        head: Math.min(doc.length, (dir ? b : a).to + 1),
+    };
+};
+/**
+ * @ignore
+ * @test
+ */
+export const bracketDeco = (state, config) => {
+    const decorations = [], { afterCursor, brackets, renderMatch, exclude, } = config;
+    for (const { empty, head } of state.selection.ranges) {
+        if (!empty) {
+            continue;
+        }
+        const tree = syntaxTree(state), excluded = exclude?.(state, head), match = !excluded && // eslint-disable-line @stylistic/operator-linebreak
+            tryMatchBracetks(state, head, config)
+            || findEnclosingBrackets(tree.resolveInner(head, -1), head, brackets)
+            || afterCursor && findEnclosingBrackets(tree.resolveInner(head, 1), head, brackets)
+            || // eslint-disable-line @stylistic/operator-linebreak
+                !excluded && // eslint-disable-line @stylistic/operator-linebreak
+                    findEnclosingPlainBrackets(state, head, config);
+        if (match) {
+            decorations.push(...renderMatch(match, state));
+        }
+    }
+    return Decoration.set(decorations, true);
+};
+const clickHandler = (e, view, facet, select) => {
+    const pos = view.posAtCoords(e), { state } = view, config = state.facet(facet);
+    if (pos === null
+        || config.exclude?.(state, pos)) {
+        return false;
+    }
+    const selection = select(state, pos, config);
+    if (selection) {
+        view.dispatch({ selection });
+        return true;
+    }
+    return false;
+};
 export default (configs) => {
-    const extension = bracketMatching(configs), [{ facet }, [field]] = extension;
-    Object.assign(field, {
-        updateF(value, { state, docChanged, selection }) {
-            if (!docChanged && !selection) {
-                return value;
-            }
-            const decorations = [], config = state.facet(facet), { afterCursor, brackets, renderMatch } = config;
-            for (const { empty, head } of state.selection.ranges) {
-                if (!empty) {
-                    continue;
+    const extension = bracketMatching(configs), [{ facet }, plugins] = extension;
+    plugins[0] = ViewPlugin.fromClass(class {
+        constructor({ state }) {
+            this.decorations = bracketDeco(state, state.facet(facet));
+            this.paused = false;
+        }
+        update({ docChanged, selectionSet, changes, state, view: { composing } }) {
+            if (docChanged || selectionSet || this.paused) {
+                if (composing) {
+                    this.decorations = this.decorations.map(changes);
+                    this.paused = true;
                 }
-                const tree = syntaxTree(state), match = matchBrackets(state, head, -1, config)
-                    || head > 0 && matchBrackets(state, head - 1, 1, config)
-                    || afterCursor && (matchBrackets(state, head, 1, config)
-                        || head < state.doc.length && matchBrackets(state, head + 1, -1, config))
-                    || findEnclosingBrackets(tree.resolveInner(head, -1), head, brackets)
-                    || afterCursor && findEnclosingBrackets(tree.resolveInner(head, 1), head, brackets)
-                    || findEnclosingPlainBrackets(state, head, config);
-                if (match) {
-                    decorations.push(...renderMatch(match, state));
+                else {
+                    this.decorations = bracketDeco(state, state.facet(facet));
+                    this.paused = false;
                 }
             }
-            return Decoration.set(decorations, true);
+        }
+    }, {
+        decorations({ decorations }) {
+            return decorations;
         },
     });
     return [
         extension,
         EditorView.domEventHandlers({
+            /** @ignore */
+            click(e, view) {
+                return e.detail === 3 && clickHandler(e, view, facet, selectLineBlock);
+            },
             /**
              * @ignore
              * @todo 由于括号高亮的重绘，双击会被识别为两次单击，导致功能失效
              */
             dblclick(e, view) {
-                const pos = view.posAtCoords(e);
-                if (pos === null) {
-                    return false;
-                }
-                const { state } = view, selection = selectMatchingBrackets(state, pos, state.facet(facet));
-                if (selection) {
-                    view.dispatch({ selection });
-                    return true;
-                }
-                return false;
+                return clickHandler(e, view, facet, selectMatchingBrackets);
             },
         }),
     ];

package/dist/matchTag.d.ts

@@ -28,6 +28,12 @@ export declare class Tag {
  * @test
  */
 export declare const getTag: (state: EditorState, node: SyntaxNode) => Tag | null;
+/**
+ * 搜索匹配的标签
+ * @param state
+ * @param origin 起始标签
+ */
+export declare const searchTag: (state: EditorState, origin: Tag) => Tag | null;
 /**
  * 匹配标签
  * @param state

package/dist/matchTag.js

@@ -3,7 +3,7 @@ import { StateField } from '@codemirror/state';
 import { ensureSyntaxTree } from '@codemirror/language';
 import { voidHtmlTags, selfClosingTags } from './config.js';
 import { matchingCls, nonmatchingCls } from './constants.js';
-import { sliceDoc } from './util.js';
+import { sliceDoc, pushDecoration } from './util.js';
 /** @test */
 export class Tag {
     get closing() {
@@ -66,7 +66,7 @@ export const getTag = (state, node) => {
  * @param state
  * @param origin 起始标签
  */
-const searchTag = (state, origin) => {
+export const searchTag = (state, origin) => {
     const { type, name, closing } = origin, siblingGetter = closing ? 'prevSibling' : 'nextSibling', endGetter = closing ? 'first' : 'last';
     let stack = closing ? -1 : 1, sibling = origin[endGetter][siblingGetter];
     while (sibling) {
@@ -128,15 +128,15 @@ export default /* @__PURE__ */ StateField.define({
             if (range.empty) {
                 const match = matchTag(state, range.head);
                 if (match) {
-                    const mark = match.matched ? matchingMark : nonmatchingMark, { start: { from, to, closing }, end } = match;
-                    decorations.push(mark.range(from, to));
+                    const mark = match.matched ? matchingMark : nonmatchingMark, { start, end } = match;
+                    pushDecoration(decorations, mark, start);
                     if (end) {
-                        decorations[closing ? 'unshift' : 'push'](mark.range(end.from, end.to));
+                        pushDecoration(decorations, mark, end);
                     }
                 }
             }
         }
-        return Decoration.set(decorations);
+        return Decoration.set(decorations, true);
     },
     provide(f) {
         return EditorView.decorations.from(f);

package/dist/mediawiki.d.ts

@@ -30,7 +30,7 @@ export declare const apply: (view: EditorView, completion: Completion, from: num
  * @param names 指定类型
  * @test
  */
-export declare const hasTag: (types: Set<string>, names: TagName | TagName[]) => boolean;
+export declare const hasTag: (types: Set<string> | string, names: TagName | TagName[]) => boolean;
 /** @test */
 export declare class FullMediaWiki extends MediaWiki {
     #private;

package/dist/mediawiki.js

@@ -48,7 +48,12 @@ export const apply = (view, completion, from, to) => {
  * @param names 指定类型
  * @test
  */
-export const hasTag = (types, names) => (Array.isArray(names) ? names : [names]).some(name => types.has(name in tokens ? tokens[name] : name));
+export const hasTag = (types, names) => {
+    if (typeof types === 'string') {
+        types = new Set(types.split('_'));
+    }
+    return (Array.isArray(names) ? names : [names]).some(name => types.has(name in tokens ? tokens[name] : name));
+};
 /** @test */
 export class FullMediaWiki extends MediaWiki {
     constructor(config, templatedata = false) {
@@ -399,7 +404,7 @@ const theme = /* @__PURE__ */ EditorView.theme({
         fontSize: '1.5em',
         lineHeight: '1.2em',
     },
-    [getSelector(['3~*', '4~*', '5~*', '6~*'], 'section--')]: {
+    [getSelector(['3', '3~*', '4', '4~*', '5', '5~*', '6', '6~*'], 'section--')]: {
         fontWeight: 'bold',
     },
     [`${getSelector(['section-header', 'template', 'parserfunction', 'file-delimiter', 'magic-link'])},${getSelector(['pagename', 'bracket', 'delimiter'], 'link-')},${getSelector(['extlink'], ['', 'free-'])},${getSelector(['bracket', 'attribute'], ['exttag-', 'htmltag-'])},${getSelector(['delimiter2', 'definition'], 'table-')}`]: {