@bhsd/codemirror-mediawiki 3.5.2 → 3.6.1

package/dist/matchTag.js

@@ -2,6 +2,7 @@ import { Decoration, EditorView } from '@codemirror/view';
 import { StateField } from '@codemirror/state';
 import { ensureSyntaxTree } from '@codemirror/language';
 import { voidHtmlTags, selfClosingTags } from './config';
+import { matchingCls, nonmatchingCls } from './constants';
 class Tag {
     get closing() {
         return isClosing(this.first, this.type, this.state, true);
@@ -109,7 +110,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: 'cm-matchingTag' }), nonmatchingMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-nonmatchingTag' });
+const matchingMark = /* @__PURE__ */ Decoration.mark({ class: matchingCls }), nonmatchingMark = /* @__PURE__ */ Decoration.mark({ class: nonmatchingCls });
 export default /* @__PURE__ */ StateField.define({
     create() {
         return Decoration.none;

package/dist/mediawiki.d.ts

@@ -8,13 +8,6 @@ import { MediaWiki } from './token';
 import type { StreamParser, TagStyle } from '@codemirror/language';
 import type { CompletionSource, Completion } from '@codemirror/autocomplete';
 import type { MwConfig } from './token';
-export declare const isWMF: boolean;
-/**
- * 判断节点是否包含指定类型
- * @param types 节点类型
- * @param names 指定类型
- */
-export declare const hasTag: (types: Set<string>, names: string | string[]) => boolean;
 export declare class FullMediaWiki extends MediaWiki {
     #private;
     readonly nsRegex: RegExp;

package/dist/mediawiki.js

@@ -5,14 +5,13 @@
  */
 import { HighlightStyle, LanguageSupport, StreamLanguage, syntaxHighlighting, syntaxTree, } from '@codemirror/language';
 import { insertCompletionText, pickedCompletion } from '@codemirror/autocomplete';
-import { wmf } from '@bhsd/common';
 import { isUnderscore } from '@bhsd/cm-util';
 import { commonHtmlAttrs, htmlAttrs, extAttrs } from 'wikiparser-node/dist/util/sharable.mjs';
-import { MediaWiki } from './token';
 import { htmlTags, tokens } from './config';
-import { braceStackUpdate } from './fold';
+import { isolateSelector, ltrSelector, isWMF } from './constants';
+import { MediaWiki } from './token';
+import { braceStackUpdate, hasTag } from './util';
 import { EditorView } from '@codemirror/view';
-export const isWMF = /* @__PURE__ */ (() => typeof location === 'object' && new RegExp(String.raw `\.(?:${wmf})\.org$`, 'u').test(location.hostname))();
 /**
  * 检查首字母大小写并插入正确的自动填充内容
  * @param view
@@ -21,22 +20,21 @@ export const isWMF = /* @__PURE__ */ (() => typeof location === 'object' && new
  * @param to 结束位置
  */
 const apply = (view, completion, from, to) => {
-    let { label } = completion;
-    const initial = label.charAt(0).toLowerCase();
-    if (view.state.sliceDoc(from, from + 1) === initial) {
+    let { label } = completion, selection;
+    const initial = label.charAt(0).toLowerCase(), { state } = view, after = state.sliceDoc(to);
+    if (state.sliceDoc(from, from + 1) === initial) {
         label = initial + label.slice(1);
     }
+    if (!/^\s*\|/u.test(after)) {
+        selection = { anchor: from + label.length + 1, head: from + label.length * 2 + 1 };
+        label += `|${label}${/^\s*\]\]/u.test(after) ? '' : ']]'}`;
+    }
     view.dispatch({
-        ...insertCompletionText(view.state, label, from, to),
+        ...insertCompletionText(state, label, from, to),
         annotations: pickedCompletion.of(completion),
+        selection,
     });
 };
-/**
- * 判断节点是否包含指定类型
- * @param types 节点类型
- * @param names 指定类型
- */
-export const hasTag = (types, names) => (Array.isArray(names) ? names : [names]).some(name => types.has(name in tokens ? tokens[name] : name));
 export class FullMediaWiki extends MediaWiki {
     constructor(config) {
         super(config);
@@ -137,7 +135,7 @@ export class FullMediaWiki extends MediaWiki {
         const underscore = str.slice(offset).includes('_');
         return {
             offset,
-            options: (await linkSuggest(search, ns, subpage)).map(([label]) => ({
+            options: (await linkSuggest(search, subpage, ns)).map(([label]) => ({
                 type: 'text',
                 label: underscore ? label.replace(/ /gu, '_') : label,
             })),
@@ -150,12 +148,11 @@ export class FullMediaWiki extends MediaWiki {
      * @param equal 是否有等号
      */
     async #paramSuggest(search, page, equal) {
-        const { config: { paramSuggest } } = this;
-        return page && typeof paramSuggest === 'function' && !/[|{}<>[\]]/u.test(page)
+        const { config: { paramSuggest } } = this, result = await paramSuggest?.(page);
+        return result?.length
             ? {
                 offset: /^\s*/u.exec(search)[0].length,
-                options: (await paramSuggest(page))
-                    .map(([key, detail]) => ({ type: 'variable', label: key + equal, detail })),
+                options: result.map(([key, detail]) => ({ type: 'variable', label: key + equal, detail })),
             }
             : undefined;
     }
@@ -496,10 +493,10 @@ const theme = /* @__PURE__ */ EditorView.theme({
     [getSelector(['pre', 'nowiki'], 'tag-')]: {
         backgroundColor: 'rgb(0,0,0,.04)',
     },
-    '.cm-bidi-isolate, &[dir="rtl"] .cm-mw-template-name': {
+    [`${isolateSelector}, &[dir="rtl"] .cm-mw-template-name`]: {
         unicodeBidi: 'isolate',
     },
-    '.cm-bidi-ltr': {
+    [ltrSelector]: {
         direction: 'ltr',
         display: 'inline-block',
     },