@bhsd/codemirror-mediawiki 3.12.0 → 3.12.1

package/dist/matchBrackets.d.ts

@@ -30,6 +30,11 @@ export declare const trySelectMatchingBrackets: (state: EditorState, pos: number
  * @test
  */
 export declare const selectMatchingBrackets: (state: EditorState, pos: number, config?: Config) => Selection | false;
+/**
+ * @ignore
+ * @test
+ */
+export declare const selectLineBlock: (state: EditorState, pos: number, config?: Config) => Selection | false;
 /**
  * @ignore
  * @test

package/dist/matchBrackets.js

@@ -56,6 +56,25 @@ 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
@@ -67,10 +86,7 @@ export const bracketDeco = (state, config) => {
             continue;
         }
         const tree = syntaxTree(state), excluded = exclude?.(state, head), match = !excluded && // eslint-disable-line @stylistic/operator-linebreak
-            (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)))
+            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
@@ -82,6 +98,19 @@ export const bracketDeco = (state, config) => {
     }
     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 }, plugins] = extension;
     plugins[0] = ViewPlugin.fromClass(class {
@@ -109,22 +138,16 @@ export default (configs) => {
     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), { state } = view, config = state.facet(facet);
-                if (pos === null
-                    || config.exclude?.(state, pos)) {
-                    return false;
-                }
-                const selection = selectMatchingBrackets(state, pos, config);
-                if (selection) {
-                    view.dispatch({ selection });
-                    return true;
-                }
-                return false;
+                return clickHandler(e, view, facet, selectMatchingBrackets);
             },
         }),
     ];

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() {
@@ -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);