@bhsd/codemirror-mediawiki 3.6.1 → 3.6.3

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.d.ts

@@ -8,6 +8,11 @@ import { MediaWiki } from './token';
 import type { StreamParser, TagStyle } from '@codemirror/language';
 import type { CompletionSource, Completion } from '@codemirror/autocomplete';
 import type { MwConfig } from './token';
+/**
+ * 是否是普通维基链接
+ * @param name 节点名称
+ */
+export declare const isWikiLink: (name: string) => boolean;
 export declare class FullMediaWiki extends MediaWiki {
     #private;
     readonly nsRegex: RegExp;

package/dist/mediawiki.js

@@ -12,6 +12,11 @@ import { isolateSelector, ltrSelector, isWMF } from './constants';
 import { MediaWiki } from './token';
 import { braceStackUpdate, hasTag } from './util';
 import { EditorView } from '@codemirror/view';
+/**
+ * 是否是普通维基链接
+ * @param name 节点名称
+ */
+export const isWikiLink = (name) => /mw-[\w-]*link-ground/u.test(name);
 /**
  * 检查首字母大小写并插入正确的自动填充内容
  * @param view
@@ -98,13 +103,12 @@ export class FullMediaWiki extends MediaWiki {
      * @param str 搜索字符串，开头不包含` `，但可能包含`_`
      * @param ns 命名空间
      */
-    async #linkSuggest(str, ns = 0) {
+    async #linkSuggest(str, ns) {
         const { config: { linkSuggest, nsid }, nsRegex } = this;
         if (typeof linkSuggest !== 'function' || /[|{}<>[\]#]/u.test(str)) {
             return undefined;
         }
         let subpage = false, search = str, offset = 0;
-        /* eslint-disable no-param-reassign */
         if (search.startsWith('/')) {
             ns = 0;
             subpage = true;
@@ -131,7 +135,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,
@@ -159,8 +162,8 @@ export class FullMediaWiki extends MediaWiki {
     /** 自动补全魔术字和标签名 */
     get completionSource() {
         return async (context) => {
-            const { state, pos, explicit } = context, node = syntaxTree(state).resolve(pos, -1), types = new Set(node.name.split('_')), isParserFunction = hasTag(types, 'parserFunctionName'), 
-            /** 开头不包含` `，但可能包含`_` */ search = state.sliceDoc(node.from, pos).trimStart(), start = pos - search.length;
+            const { state, pos, explicit } = context, node = syntaxTree(state).resolve(pos, -1), { name: n, from: f, to: t } = node, types = new Set(n.split('_')), isParserFunction = hasTag(types, 'parserFunctionName'), 
+            /** 开头不包含` `，但可能包含`_` */ search = state.sliceDoc(f, pos).trimStart(), start = pos - search.length;
             let { prevSibling } = node;
             if (explicit || isParserFunction && search.includes('#') || isWMF) {
                 const validFor = isWMF ? null : { validFor: /^[^|{}<>[\]#]*$/u };
@@ -184,16 +187,20 @@ export class FullMediaWiki extends MediaWiki {
                 }
                 const isPage = hasTag(types, 'pageName') && hasTag(types, 'parserFunction') || 0;
                 if (isPage && search.trim() || hasTag(types, 'linkPageName')) {
-                    let prefix = '';
+                    const isLink = isWikiLink(n);
+                    let prefix = '', ns = 0;
                     if (isPage) {
-                        prefix = this.autocompleteNamespaces[[...types].find(t => t.startsWith('mw-function-'))
+                        prefix = this.autocompleteNamespaces[[...types].find(type => type.startsWith('mw-function-'))
                             .slice(12)];
                     }
-                    const suggestions = await this.#linkSuggest(prefix + search);
+                    else if (hasTag(types, 'mw-tag-gallery') && !isLink) {
+                        ns = 6;
+                    }
+                    const suggestions = await this.#linkSuggest(prefix + search, ns);
                     if (!suggestions) {
                         return null;
                     }
-                    else if (!isPage) {
+                    else if (!isPage && isLink) {
                         suggestions.options = suggestions.options.map((option) => ({ ...option, apply }));
                     }
                     else if (prefix === 'Module:') {
@@ -235,7 +242,7 @@ export class FullMediaWiki extends MediaWiki {
                         ({ prevSibling } = prevSibling);
                     }
                     if (prevSibling && page) {
-                        const equal = isArgument && state.sliceDoc(pos, node.to).trim() === '=' ? '' : '=', suggestions = await this.#paramSuggest(isDelimiter ? '' : search, page, equal);
+                        const equal = isArgument && state.sliceDoc(pos, t).trim() === '=' ? '' : '=', suggestions = await this.#paramSuggest(isDelimiter ? '' : search, page, equal);
                         if (suggestions && suggestions.options.length > 0) {
                             return {
                                 from: isDelimiter ? pos : start + suggestions.offset,
@@ -249,7 +256,7 @@ export class FullMediaWiki extends MediaWiki {
             const isTagName = hasTag(types, ['htmlTagName', 'extTagName']), explicitMatch = explicit && context.matchBefore(/\s$/u), validForAttr = /^[a-z]*$/iu;
             if (isTagName && explicitMatch
                 || hasTag(types, ['htmlTagAttribute', 'extTagAttribute', 'tableDefinition'])) {
-                const tagName = isTagName ? search.trim() : /mw-(?:ext|html)-([a-z]+)/u.exec(node.name)[1], mt = explicitMatch || context.matchBefore(hasTag(types, 'tableDefinition') ? /[\s|-][a-z]+$/iu : /\s[a-z]+$/iu);
+                const tagName = isTagName ? search.trim() : /mw-(?:ext|html)-([a-z]+)/u.exec(n)[1], mt = explicitMatch || context.matchBefore(hasTag(types, 'tableDefinition') ? /[\s|-][a-z]+$/iu : /\s[a-z]+$/iu);
                 return mt && (mt.from < start || /^\s/u.test(mt.text))
                     ? {
                         from: mt.from + 1,
@@ -266,7 +273,7 @@ export class FullMediaWiki extends MediaWiki {
                     : null;
             }
             else if (explicit && hasTag(types, ['tableTd', 'tableTh', 'tableCaption'])) {
-                const [, tagName] = /mw-table-([a-z]+)/u.exec(node.name), mt = context.matchBefore(/[\s|!+][a-z]*$/iu);
+                const [, tagName] = /mw-table-([a-z]+)/u.exec(n), mt = context.matchBefore(/[\s|!+][a-z]*$/iu);
                 if (mt && (mt.from < start || /^\s/u.test(mt.text))) {
                     return {
                         from: mt.from + 1,
@@ -297,7 +304,7 @@ export class FullMediaWiki extends MediaWiki {
                 };
             }
             mt = context.matchBefore(/<\/?[a-z\d]*$/iu);
-            const extTags = [...types].filter(t => t.startsWith('mw-tag-'))
+            const extTags = [...types].filter(type => type.startsWith('mw-tag-'))
                 .map(s => s.slice(7));
             if (mt && (explicit || mt.to - mt.from > 1)) {
                 const validFor = /^[a-z\d]*$/iu;
@@ -493,6 +500,9 @@ const theme = /* @__PURE__ */ EditorView.theme({
     [getSelector(['pre', 'nowiki'], 'tag-')]: {
         backgroundColor: 'rgb(0,0,0,.04)',
     },
+    '.cm-mw-tag-ref': {
+        backgroundColor: 'var(--cm-ref)',
+    },
     [`${isolateSelector}, &[dir="rtl"] .cm-mw-template-name`]: {
         unicodeBidi: 'isolate',
     },