@bhsd/codemirror-mediawiki 3.12.0 → 3.12.2

package/dist/matchBrackets.d.ts

@@ -25,15 +25,12 @@ export declare const findEnclosingPlainBrackets: (state: EditorState, pos: numbe
  * @test
  */
 export declare const trySelectMatchingBrackets: (state: EditorState, pos: number, dir: 1 | -1, config?: Config, inside?: boolean) => Selection | false;
+/** @test */
+export declare const customSelection: Record<number, (state: EditorState, pos: number, config?: Config) => Selection | false>;
 /**
  * @ignore
  * @test
  */
-export declare const selectMatchingBrackets: (state: EditorState, pos: number, config?: Config) => Selection | false;
-/**
- * @ignore
- * @test
- */
-export declare const bracketDeco: (state: EditorState, config: RequiredConfig) => DecorationSet;
+export declare const myBracketDeco: (state: EditorState, config: RequiredConfig) => DecorationSet;
 declare const _default: (configs?: BracketConfig) => Extension;
 export default _default;

package/dist/matchBrackets.js

@@ -1,4 +1,5 @@
 import { Decoration, EditorView, ViewPlugin } from '@codemirror/view';
+import { EditorSelection } from '@codemirror/state';
 import { bracketMatching, matchBrackets, syntaxTree } from '@codemirror/language';
 /**
  * @ignore
@@ -48,29 +49,41 @@ export const trySelectMatchingBrackets = (state, pos, dir, config, inside = fals
         head: match.end[rightInside ? 'from' : 'to'],
     };
 };
+/** @test */
+export const customSelection = {
+    2: (state, pos, config) => trySelectMatchingBrackets(state, pos, -1, config)
+        || trySelectMatchingBrackets(state, pos, 1, config)
+        || trySelectMatchingBrackets(state, pos + 1, -1, config, true)
+        || trySelectMatchingBrackets(state, pos - 1, 1, config, true),
+    3: (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),
+        };
+    },
+    4: state => ({ anchor: 0, head: state.doc.length }),
+};
+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 selectMatchingBrackets = (state, pos, config) => trySelectMatchingBrackets(state, pos, -1, config)
-    || trySelectMatchingBrackets(state, pos, 1, config)
-    || trySelectMatchingBrackets(state, pos + 1, -1, config, true)
-    || trySelectMatchingBrackets(state, pos - 1, 1, config, true);
-/**
- * @ignore
- * @test
- */
-export const bracketDeco = (state, config) => {
+export const myBracketDeco = (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
-            (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,11 +95,25 @@ 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 range = select(state, pos, config);
+    if (range) {
+        const selection = EditorSelection.single(range.anchor, range.head);
+        view.dispatch({ selection });
+        return selection;
+    }
+    return false;
+};
 export default (configs) => {
     const extension = bracketMatching(configs), [{ facet }, plugins] = extension;
     plugins[0] = ViewPlugin.fromClass(class {
         constructor({ state }) {
-            this.decorations = bracketDeco(state, state.facet(facet));
+            this.decorations = myBracketDeco(state, state.facet(facet));
             this.paused = false;
         }
         update({ docChanged, selectionSet, changes, state, view: { composing } }) {
@@ -96,7 +123,7 @@ export default (configs) => {
                     this.paused = true;
                 }
                 else {
-                    this.decorations = bracketDeco(state, state.facet(facet));
+                    this.decorations = myBracketDeco(state, state.facet(facet));
                     this.paused = false;
                 }
             }
@@ -106,6 +133,7 @@ export default (configs) => {
             return decorations;
         },
     });
+    let selection = false;
     return [
         extension,
         EditorView.domEventHandlers({
@@ -113,18 +141,27 @@ export default (configs) => {
              * @ignore
              * @todo 由于括号高亮的重绘，双击会被识别为两次单击，导致功能失效
              */
-            dblclick(e, view) {
-                const pos = view.posAtCoords(e), { state } = view, config = state.facet(facet);
-                if (pos === null
-                    || config.exclude?.(state, pos)) {
+            mousedown(e, view) {
+                selection = e.detail in customSelection && clickHandler(e, view, facet, customSelection[e.detail]);
+                return Boolean(selection);
+            },
+            /** @ignore */
+            mouseup() {
+                selection = false;
+            },
+            /** @ignore */
+            mousemove(e, view) {
+                if (!selection) {
                     return false;
                 }
-                const selection = selectMatchingBrackets(state, pos, config);
-                if (selection) {
-                    view.dispatch({ selection });
-                    return true;
+                const head = view.posAtCoords(e), { from, to } = selection.main;
+                if (head === null || head >= from && head <= to) {
+                    return false;
                 }
-                return false;
+                view.dispatch({
+                    selection: { head, anchor: head < from ? to : from },
+                });
+                return true;
             },
         }),
     ];

package/dist/matchTag.d.ts

@@ -5,11 +5,11 @@ import type { MatchResult } from '@codemirror/language';
 import type { SyntaxNode } from '@lezer/common';
 declare type TagType = 'ext' | 'html';
 export interface TagMatchResult extends MatchResult {
-    start: Tag;
-    end?: Tag;
+    start: WikiTag;
+    end?: WikiTag;
 }
 /** @test */
-export declare class Tag {
+export declare class WikiTag {
     readonly type: TagType;
     readonly name: string;
     readonly first: SyntaxNode;
@@ -27,13 +27,13 @@ export declare class Tag {
  * @param node 语法树节点
  * @test
  */
-export declare const getTag: (state: EditorState, node: SyntaxNode) => Tag | null;
+export declare const getTag: (state: EditorState, node: SyntaxNode) => WikiTag | null;
 /**
  * 搜索匹配的标签
  * @param state
  * @param origin 起始标签
  */
-export declare const searchTag: (state: EditorState, origin: Tag) => Tag | null;
+export declare const searchTag: (state: EditorState, origin: WikiTag) => WikiTag | null;
 /**
  * 匹配标签
  * @param state

package/dist/matchTag.js

@@ -3,9 +3,9 @@ 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 {
+export class WikiTag {
     get closing() {
         return isClosing(this.first, this.type, this.state, true);
     }
@@ -59,7 +59,7 @@ export const getTag = (state, node) => {
         ({ prevSibling } = prevSibling);
     }
     const name = getName(state, nameNode);
-    return new Tag(type, name, prevSibling, nextSibling, state);
+    return new WikiTag(type, name, prevSibling, nextSibling, state);
 };
 /**
  * 搜索匹配的标签
@@ -114,7 +114,7 @@ export const matchTag = (state, pos) => {
     const end = searchTag(state, start);
     return end ? { matched: true, start, end } : { matched: false, start };
 };
-const matchingMark = /* @__PURE__ */ Decoration.mark({ class: matchingCls }), nonmatchingMark = /* @__PURE__ */ Decoration.mark({ class: nonmatchingCls });
+const matchingTag = /* @__PURE__ */ Decoration.mark({ class: matchingCls }), nonmatchingTag = /* @__PURE__ */ Decoration.mark({ class: nonmatchingCls });
 export default /* @__PURE__ */ StateField.define({
     create() {
         return Decoration.none;
@@ -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 ? matchingTag : nonmatchingTag, { 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

@@ -6,7 +6,7 @@
 import { LanguageSupport } from '@codemirror/language';
 import { EditorView } from '@codemirror/view';
 import { MediaWiki } from './token.js';
-import type { StreamParser, TagStyle } from '@codemirror/language';
+import type { TagStyle } from '@codemirror/language';
 import type { CompletionSource, Completion } from '@codemirror/autocomplete';
 import type { MwConfig } from './token';
 import type { TagName } from './config';
@@ -52,7 +52,6 @@ export declare class FullMediaWiki extends MediaWiki {
      * @see https://codemirror.net/docs/ref/#language.TagStyle
      */
     getTagStyles(): TagStyle[];
-    mediawiki(tags?: string[]): StreamParser<any>;
     /** 自动补全魔术字和标签名 */
     get completionSource(): CompletionSource;
 }

package/dist/mediawiki.js

@@ -10,6 +10,7 @@ import { isUnderscore } from '@bhsd/cm-util';
 import { commonHtmlAttrs, htmlAttrs, extAttrs } from 'wikiparser-node/dist/util/sharable.mjs';
 import { htmlTags, tokens } from './config.js';
 import { hoverSelector, isWMF, } from './constants.js';
+import { lightHighlightStyle } from './theme.js';
 import { MediaWiki } from './token.js';
 import { leadingSpaces, findTemplateName } from './util.js';
 const ranks = { Required: 1, Suggested: 2, Optional: 3, Deprecated: 4 };
@@ -107,13 +108,6 @@ export class FullMediaWiki extends MediaWiki {
             class: `cm-${className}`,
         }));
     }
-    mediawiki(tags) {
-        const parser = super.mediawiki(tags);
-        parser.languageData = {
-            closeBrackets: { brackets: ['(', '[', '{', '"'], before: ')]}>' },
-        };
-        return parser;
-    }
     /**
      * 提供链接建议
      * @param str 搜索字符串，开头不包含` `，但可能包含`_`
@@ -395,7 +389,7 @@ const getGrounds = (grounds, r, g, b, a) => ({
  * @license GPL-2.0-or-later
  * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
  */
-const theme = /* @__PURE__ */ EditorView.theme({
+const wikiTheme = /* @__PURE__ */ EditorView.theme({
     [getSelector(['', '~*'], 'section--1')]: {
         fontSize: '1.8em',
         lineHeight: '1.2em',
@@ -546,8 +540,9 @@ const theme = /* @__PURE__ */ EditorView.theme({
 export const mediawikiBase = (config, templatedata) => {
     const mode = new FullMediaWiki(config, templatedata), lang = StreamLanguage.define(mode.mediawiki());
     return new LanguageSupport(lang, [
+        lightHighlightStyle,
         syntaxHighlighting(HighlightStyle.define(mode.getTagStyles())),
-        theme,
+        wikiTheme,
         lang.data.of({ autocomplete: mode.completionSource }),
     ]);
 };