@bhsd/codemirror-mediawiki 3.6.0 → 3.6.2

package/dist/matchBrackets.js

@@ -10,14 +10,12 @@ export const findEnclosingBrackets = (node, pos, brackets) => {
                 return { start: firstChild, end: lastChild, matched: true };
             }
         }
-        ({ parent } = parent); // eslint-disable-line no-param-reassign
+        ({ parent } = parent);
     }
     return undefined;
 };
 export const findEnclosingPlainBrackets = (state, pos, config) => {
-    const { brackets, maxScanDistance } = config, re = new RegExp(`[${
-    // eslint-disable-next-line @typescript-eslint/no-misused-spread
-    [...brackets].filter((_, i) => i % 2).map(c => c === ']' ? String.raw `\]` : c).join('')}]`, 'gu'), str = state.sliceDoc(pos, pos + maxScanDistance);
+    const { brackets, maxScanDistance } = config, re = new RegExp(`[${[...brackets].filter((_, i) => i % 2).map(c => c === ']' ? String.raw `\]` : c).join('')}]`, 'gu'), str = state.sliceDoc(pos, pos + maxScanDistance);
     let mt = re.exec(str);
     while (mt) {
         const result = matchBrackets(state, pos + mt.index + 1, -1, config), left = result?.end?.to;

package/dist/mediawiki.js

@@ -20,14 +20,19 @@ import { EditorView } from '@codemirror/view';
  * @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,
     });
 };
 export class FullMediaWiki extends MediaWiki {
@@ -99,7 +104,6 @@ export class FullMediaWiki extends MediaWiki {
             return undefined;
         }
         let subpage = false, search = str, offset = 0;
-        /* eslint-disable no-param-reassign */
         if (search.startsWith('/')) {
             ns = 0;
             subpage = true;
@@ -126,7 +130,6 @@ export class FullMediaWiki extends MediaWiki {
                 search = `${ns === -2 ? 'File' : prefix}:${search.slice(length)}`;
             }
         }
-        /* eslint-enable no-param-reassign */
         const underscore = str.slice(offset).includes('_');
         return {
             offset,