@bhsd/codemirror-mediawiki 3.5.1 → 3.6.0

package/dist/token.js

@@ -170,6 +170,7 @@ const lookahead = (chars, comment) => {
         '<': comment ? '<(?!!--)' : '<(?!!--|/?[a-z])',
         '~': '~~?(?!~)',
         _: '_(?!_)',
+        '＿': '＿(?!＿)',
         '[': String.raw `\[(?!\[)`,
         ']': String.raw `\](?!\])`,
         '/': '/(?!>)',
@@ -329,7 +330,7 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     'canonicalurle',
     'int',
     'msgnw',
-]), substs = new Set(['subst', 'safesubst']), headerRegex = new RegExp(`^(?:[^&[<{~'-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(`^(?:[^|[&:}{<~'_-]|${lookahead("}{<~'_-")})+`, 'iu'), styleRegex = new RegExp(`^(?:[^|[&}{<~'_-]|${lookahead("}{<~'_-")})+`, 'iu'), wikiRegex = new RegExp(`^(?:[^&'{[<~_:-]|${lookahead("'{[<~_-")})+`, 'iu'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${lookahead('{<')})+`, 'iu'), tableCellRegex = /^\s*(?:[|!]|\{\{\s*![!)+-]?\s*\}\})/u, extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_{-", htmlAttrChars = '{/', freeRegex = [false, true].map(lpar => {
+]), substs = new Set(['subst', 'safesubst']), headerRegex = new RegExp(`^(?:[^&[<{~'-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(`^(?:[^|[&:}{<~'_＿-]|${lookahead("}{<~'_＿-")})+`, 'iu'), styleRegex = new RegExp(`^(?:[^|[&}{<~'_＿-]|${lookahead("}{<~'_＿-")})+`, 'iu'), wikiRegex = new RegExp(`^(?:[^&'{[<~_＿:-]|${lookahead("'{[<~_＿-")})+`, 'iu'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${lookahead('{<')})+`, 'iu'), tableCellRegex = /^\s*(?:[|!]|\{\{\s*![!)+-]?\s*\}\})/u, extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_＿{-", htmlAttrChars = '{/', freeRegex = [false, true].map(lpar => {
     const punctuations = getPunctuations(lpar), source = getUrlRegex(punctuations);
     return new RegExp(`^(?:${source}|[${punctuations}]+(?=${source}))*`, 'u');
 }), indentedTableRegex = [false, true].map(isTemplate => new RegExp(String.raw `^:*\s*(?=\{${getPipe(isTemplate)})`, 'u')), tableRegex = [false, true]
@@ -340,7 +341,10 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     new RegExp(String.raw `^(?:[<>{}]|%(?:3[ce]|[57][bd])|${lookahead('[]')})+`, 'iu'),
     new RegExp(String.raw `^(?:\}|${lookahead('[]{')})+`, 'u'),
     new RegExp(String.raw `^(?:[>}]|%(?:3[ce]|[57][bd])|${lookahead('[]{<')})+`, 'iu'),
-], tableDefinitionValueRegex = ['', '='].map(equal => new RegExp(String.raw `^(?:[^\s&${tableDefinitionChars}${equal}]|${lookahead(tableDefinitionChars)})+`, 'iu')), variableRegex = [false, true].map(isDefault => new RegExp(String.raw `^(?:[^|{}<${isDefault ? "[&~'_:-" : ''}]|\}(?!\}\})|${isDefault ? lookahead("{<~'_-") : lookahead('{<', true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${chars}]|${lookahead(chars)})+`, 'iu'))), getExtLinkTextRegex = getRegex(pipe => new RegExp(String.raw `^(?:[^\]&${pipe}${extLinkChars}]|${lookahead(extLinkChars)})+`, 'iu')), getExtLinkRegex = getRegex(pipe => new RegExp(`^(?:${getUrlRegex(pipe)})+`, 'u')), getTableDefinitionRegex = getRegex(s => new RegExp(`^(?:[^&${tableDefinitionChars}${s}]|${lookahead(tableDefinitionChars)})+`, 'iu')), getTableCellRegex = getRegex(s => new RegExp(`^(?:[^[&${s}${tableCellChars}]|${lookahead(tableCellChars)})+`, 'iu')), getHtmlAttrRegex = getRegex(s => new RegExp(`^(?:[^<>&${htmlAttrChars}${s}]|${lookahead(htmlAttrChars)})+`, 'u')), getHtmlAttrKeyRegex = getRegex(pipe => new RegExp(`^(?:[^<>&={/${pipe}]|${lookahead('{/')})+`, 'u')), getExtAttrRegex = getRegex(s => new RegExp(`^(?:[^>/${s}]|${lookahead('/')})+`, 'u')), getExtTagCloseRegex = getRegex(name => name === 'onlyinclude'
+], tableDefinitionValueRegex = ['', '='].map(equal => new RegExp(String.raw `^(?:[^\s&${tableDefinitionChars}${equal}]|${lookahead(tableDefinitionChars)})+`, 'iu')), variableRegex = [false, true].map(isDefault => new RegExp(String.raw `^(?:[^|{}<${isDefault ? "[&~'_＿:-" : ''}]|\}(?!\}\})|${isDefault ? lookahead("{<~'_＿-") : lookahead('{<', true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${chars}]|${lookahead(chars)})+`, 'iu'))), doubleUnderscoreRegex = {
+    _: /^[\p{L}\p{N}_]+?__/u,
+    '＿': /^[\p{L}\p{N}_＿]+?＿{2}/u,
+}, getExtLinkTextRegex = getRegex(pipe => new RegExp(String.raw `^(?:[^\]&${pipe}${extLinkChars}]|${lookahead(extLinkChars)})+`, 'iu')), getExtLinkRegex = getRegex(pipe => new RegExp(`^(?:${getUrlRegex(pipe)})+`, 'u')), getTableDefinitionRegex = getRegex(s => new RegExp(`^(?:[^&${tableDefinitionChars}${s}]|${lookahead(tableDefinitionChars)})+`, 'iu')), getTableCellRegex = getRegex(s => new RegExp(`^(?:[^[&${s}${tableCellChars}]|${lookahead(tableCellChars)})+`, 'iu')), getHtmlAttrRegex = getRegex(s => new RegExp(`^(?:[^<>&${htmlAttrChars}${s}]|${lookahead(htmlAttrChars)})+`, 'u')), getHtmlAttrKeyRegex = getRegex(pipe => new RegExp(`^(?:[^<>&={/${pipe}]|${lookahead('{/')})+`, 'u')), getExtAttrRegex = getRegex(s => new RegExp(`^(?:[^>/${s}]|${lookahead('/')})+`, 'u')), getExtTagCloseRegex = getRegex(name => name === 'onlyinclude'
     ? /<\/onlyinclude(?:>|$)/u
     : new RegExp(String.raw `</${name}\s*(?:>|$)`, 'iu')), getNestedRegex = getRegex(tag => new RegExp(String.raw `^(?:[^<]|<(?!${tag}(?:[\s/>]|$)))+`, 'iu'));
 /** Adapted from the original CodeMirror 5 stream parser by Pavel Astakhov */
@@ -469,7 +473,7 @@ let MediaWiki = (() => {
             this.imgRegex = new RegExp(String.raw `^(?:${this.img.filter(word => word.endsWith('$1')).map(word => word.slice(0, -2))
                 .join('|')}|(?:${this.img.filter(word => !word.endsWith('$1')).join('|')}|(?:\d+x?|\d*x\d+)\s*(?:px)?px)\s*(?=\||\]\]|$))`, 'u');
             this.tags = [...Object.keys(tags), 'includeonly', 'noinclude', 'onlyinclude'];
-            this.convertRegex = new RegExp(String.raw `^(?:[^}|;&='{[<~_-]|\}(?!-)|=(?!>)|\[(?!\[|${urlProtocols})|${lookahead("'{<~_-")})+`, 'iu');
+            this.convertRegex = new RegExp(String.raw `^(?:[^}|;&='{[<~_＿-]|\}(?!-)|=(?!>)|\[(?!\[|${urlProtocols})|${lookahead("'{<~_＿-")})+`, 'iu');
             this.convertSemicolon = variants && new RegExp(String.raw `^;\s*(?=(?:[^;]*?=>\s*)?(?:${variants.join('|')})\s*:|(?:$|\}-))`, 'iu');
             this.convertLang = variants
                 && new RegExp(String.raw `^(?:=>\s*)?(?:${variants.join('|')})\s*:`, 'iu');
@@ -706,14 +710,15 @@ let MediaWiki = (() => {
                         }
                         break;
                     }
-                    case '_': {
+                    case '_':
+                    case '＿': {
                         const { pos } = stream;
-                        stream.eatWhile('_');
+                        stream.eatWhile(ch);
                         switch (stream.pos - pos) {
                             case 0:
                                 break;
                             case 1:
-                                return this.eatDoubleUnderscore(style, stream, state);
+                                return this.eatDoubleUnderscore(style, ch, stream, state);
                             default:
                                 if (!stream.eol()) {
                                     stream.backUp(2);
@@ -768,13 +773,13 @@ let MediaWiki = (() => {
                     // no default
                 }
                 if (state.stack.length === 0) {
-                    if (ch !== '_') {
+                    if (ch !== '_' && ch !== '＿') {
                         // highlight free external links, bug T108448
                         if (/[\p{L}\p{N}]/u.test(ch)) {
                             stream.backUp(1);
                         }
                         else {
-                            stream.eatWhile(/[^\p{L}\p{N}_&'{[<~:-]/u);
+                            stream.eatWhile(/[^\p{L}\p{N}_＿&'{[<~:-]/u);
                         }
                         const mt = stream.match(this.urlProtocols, false);
                         if (mt) {
@@ -978,11 +983,11 @@ let MediaWiki = (() => {
             }
             return makeLocalTagStyle('list', state);
         }
-        eatDoubleUnderscore(style, stream, state) {
-            const { config: { doubleUnderscore } } = this, name = stream.match(/^[\p{L}\p{N}_]+?__/u);
+        eatDoubleUnderscore(style, ch, stream, state) {
+            const { config: { doubleUnderscore } } = this, underscore = ch.repeat(2), name = stream.match(doubleUnderscoreRegex[ch]);
             if (name) {
-                if (Object.prototype.hasOwnProperty.call(doubleUnderscore[0], `__${name[0].toLowerCase()}`)
-                    || Object.prototype.hasOwnProperty.call(doubleUnderscore[1], `__${name[0]}`)) {
+                if (Object.prototype.hasOwnProperty.call(doubleUnderscore[0], underscore + name[0].toLowerCase())
+                    || Object.prototype.hasOwnProperty.call(doubleUnderscore[1], underscore + name[0])) {
                     return tokens.doubleUnderscore;
                 }
                 else if (!stream.eol()) {
@@ -1583,7 +1588,7 @@ let MediaWiki = (() => {
             if (n === 0) {
                 return this.inTemplateArgument(true, true);
             }
-            const chars = n === 2 ? '}{<' : "}{<~'_-"; // `#invoke`/`#tag`
+            const chars = n === 2 ? '}{<' : "}{<~'_＿-"; // `#invoke`/`#tag`
             let style = `${tokens.parserFunction} ${module ? tokens.pageName : ''}`;
             switch (module) {
                 case 1:

package/dist/util.d.ts

@@ -0,0 +1,39 @@
+import type { EditorView, TooltipView } from '@codemirror/view';
+import type { Text, EditorState } from '@codemirror/state';
+import type { SyntaxNode } from '@lezer/common';
+import type { Position } from 'vscode-languageserver-types';
+/**
+ * 转义HTML字符串
+ * @param text 原字符串
+ */
+export declare const escHTML: (text: string) => string;
+/**
+ * 将索引转换为位置
+ * @param doc Text 实例
+ * @param index 索引
+ */
+export declare const indexToPos: (doc: Text, index: number) => Position;
+/**
+ * 将位置转换为索引
+ * @param doc Text 实例
+ * @param pos 位置
+ */
+export declare const posToIndex: (doc: Text, pos: Position) => number;
+/**
+ * 创建 TooltipView
+ * @param view EditorView 实例
+ * @param innerHTML 提示内容
+ */
+export declare const createTooltipView: (view: EditorView, innerHTML: string) => TooltipView;
+/**
+ * Update the stack of opening (+) or closing (-) brackets
+ * @param state
+ * @param node 语法树节点
+ */
+export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) => [number, number];
+/**
+ * 判断节点是否包含指定类型
+ * @param types 节点类型
+ * @param names 指定类型
+ */
+export declare const hasTag: (types: Set<string>, names: string | string[]) => boolean;

package/dist/util.js

@@ -0,0 +1,53 @@
+import elt from 'crelt';
+import { tokens } from './config';
+import { hoverSelector } from './constants';
+const dict = { '\n': '<br>', '&': '&amp;', '<': '&lt;' };
+/**
+ * 转义HTML字符串
+ * @param text 原字符串
+ */
+export const escHTML = (text) => text.replace(/[\n<&]/gu, ch => dict[ch]);
+/**
+ * 将索引转换为位置
+ * @param doc Text 实例
+ * @param index 索引
+ */
+export const indexToPos = (doc, index) => {
+    const line = doc.lineAt(index);
+    return { line: line.number - 1, character: index - line.from };
+};
+/**
+ * 将位置转换为索引
+ * @param doc Text 实例
+ * @param pos 位置
+ */
+export const posToIndex = (doc, pos) => {
+    const line = doc.line(pos.line + 1);
+    return Math.min(line.from + pos.character, line.to);
+};
+/**
+ * 创建 TooltipView
+ * @param view EditorView 实例
+ * @param innerHTML 提示内容
+ */
+export const createTooltipView = (view, innerHTML) => {
+    const inner = elt('div'), dom = elt('div', { class: hoverSelector.slice(1) }, inner);
+    dom.style.font = getComputedStyle(view.contentDOM).font;
+    inner.innerHTML = innerHTML;
+    return { dom };
+};
+/**
+ * Update the stack of opening (+) or closing (-) brackets
+ * @param state
+ * @param node 语法树节点
+ */
+export const braceStackUpdate = (state, node) => {
+    const brackets = state.sliceDoc(node.from, node.to);
+    return [brackets.split('{{').length - 1, 1 - brackets.split('}}').length];
+};
+/**
+ * 判断节点是否包含指定类型
+ * @param types 节点类型
+ * @param names 指定类型
+ */
+export const hasTag = (types, names) => (Array.isArray(names) ? names : [names]).some(name => types.has(name in tokens ? tokens[name] : name));

package/dist/vue.js

@@ -2,8 +2,8 @@ import { vue } from '@codemirror/lang-vue';
 import { htmlLanguage, htmlCompletionSource } from '@codemirror/lang-html';
 import { javascript } from '@codemirror/lang-javascript';
 import { LanguageSupport } from '@codemirror/language';
-import { jsCompletion } from './javascript';
 import { cssCompletion } from './css';
+import { jsCompletion } from './javascript';
 export default () => vue({
     base: new LanguageSupport(htmlLanguage, [
         htmlLanguage.data.of({ autocomplete: htmlCompletionSource }),