@bhsd/codemirror-mediawiki 3.11.5 → 3.12.1

package/LICENSE

@@ -1,3 +1,22 @@
+@bhsd/codemirror-mediawiki
+Copyright (C) 2022  Bhsd
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

package/README.md

@@ -68,6 +68,7 @@ If you are just looking for a CodeMirror 6 language mode and language support ex
 	- [bidiIsolates](#bidiisolates)
 	- [bracketMatching](#bracketmatching)
 	- [closeBrackets](#closebrackets)
+	- [closeTags](#closetags)
 	- [codeFolding](#codefolding)
 	- [colorPicker](#colorpicker)
 	- [escape](#escape)
@@ -259,11 +260,11 @@ In addition to the common [extensions](#extensions), here are some HTML-specific
 ```js
 import {
 	registerBracketMatchingForHTML,
-	registerCloseBracketsForHTML,
+	registerCloseTagsForHTML,
 	registerColorPickerForHTML,
 } from '@bhsd/codemirror-mediawiki';
 registerBracketMatchingForHTML();
-registerCloseBracketsForHTML();
+registerCloseTagsForHTML();
 registerColorPickerForHTML();
 ```
 
@@ -408,10 +409,10 @@ In addition to the common [extensions](#extensions), here are some Vue-specific
 
 ```js
 import {
-	registerCloseBracketsForVue,
+	registerCloseTagsForVue,
 	registerColorPickerForVue,
 } from '@bhsd/codemirror-mediawiki';
-registerCloseBracketsForVue();
+registerCloseTagsForVue();
 registerColorPickerForVue();
 ```
 
@@ -722,6 +723,7 @@ cm.prefer([
 	'autocompletion',
 	'bracketMatching',
 	'closeBrackets',
+	'closeTags',
 	'codeFolding',
 	'highlightActiveLine',
 	'highlightSelectionMatches',
@@ -746,6 +748,7 @@ cm.prefer({
 	autocompletion: false,
 	bracketMatching: false,
 	closeBrackets: false,
+	closeTags: false,
 	codeFolding: false,
 	highlightActiveLine: false,
 	highlightSelectionMatches: false,
@@ -1070,6 +1073,30 @@ registerCloseBrackets();
 
 </details>
 
+### closeTags
+
+<details>
+	<summary>Expand</summary>
+
+*version added: 3.12.0*
+
+Automatically close HTML/XML tags.
+
+For granular control over the bundled extensions, you need to register this extension for specific languages([HTML](#html), [MediaWiki](#mediawiki) or [Vue](#vue)):
+
+```js
+import {
+	registerCloseTagsForHTML,
+	registerCloseTagsForMediaWiki,
+	registerCloseTagsForVue,
+} from '@bhsd/codemirror-mediawiki';
+registerCloseTagsForHTML();
+registerCloseTagsForMediaWiki();
+registerCloseTagsForVue();
+```
+
+</details>
+
 ### codeFolding
 
 <details>
@@ -1105,11 +1132,19 @@ registerCodeFolding();
 
 Provide color pickers for CSS and MediaWiki modes.
 
-For granular control over the bundled extensions, you can import the `registerColorPicker` functions. Note that you also need to register this extension for specific languages([CSS](#css), [MediaWiki](#mediawiki) or [Vue](#vue)):
+For granular control over the bundled extensions, you need to register this extension for specific languages([CSS](#css), [HTML](#html), [MediaWiki](#mediawiki) or [Vue](#vue)):
 
 ```js
-import {registerColorPicker} from '@bhsd/codemirror-mediawiki';
-registerColorPicker();
+import {
+	registerColorPickerForCSS,
+	registerColorPickerForHTML,
+	registerColorPickerForMediaWiki,
+	registerColorPickerForVue,
+} from '@bhsd/codemirror-mediawiki';
+registerColorPickerForCSS();
+registerColorPickerForHTML();
+registerColorPickerForMediaWiki();
+registerColorPickerForVue();
 ```
 
 </details>

package/dist/bidi.js

@@ -4,10 +4,11 @@
  * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
  */
 import { EditorView, Direction, ViewPlugin, Decoration } from '@codemirror/view';
-import { Prec, RangeSetBuilder } from '@codemirror/state';
+import { Prec } from '@codemirror/state';
 import { syntaxTree } from '@codemirror/language';
 import { tokens } from './config.js';
 import { getTag } from './matchTag.js';
+import { pushDecoration } from './util.js';
 const isolateSelector = '.cm-bidi-isolate', ltrSelector = '.cm-bidi-ltr', cls = isolateSelector.slice(1), isolateLTR = Decoration.mark({
     class: `${cls} ${ltrSelector.slice(1)}`,
     bidiIsolate: Direction.LTR,
@@ -18,7 +19,7 @@ const isolateSelector = '.cm-bidi-isolate', ltrSelector = '.cm-bidi-ltr', cls =
  * @test
  */
 export const computeIsolates = ({ visibleRanges, state, textDirection }) => {
-    const set = new RangeSetBuilder();
+    const set = [];
     if (textDirection === Direction.RTL) {
         for (const { from, to } of visibleRanges) {
             let node = syntaxTree(state).resolve(from, 1), td = 0, table = 0, parameter = 0;
@@ -27,13 +28,13 @@ export const computeIsolates = ({ visibleRanges, state, textDirection }) => {
                 if (/-(?:ext|html)tag-bracket/u.test(name) && state.sliceDoc(f, t).includes('<')) {
                     const tag = getTag(state, nextSibling);
                     if (tag) {
-                        set.add(tag.from, tag.to, isolateLTR);
+                        pushDecoration(set, isolateLTR, tag);
                     }
                 }
                 else if (!td && !table && name.includes(tokens.tableDefinition)) {
                     if (/-html-(?:table|tr)/u.test(name)) {
                         table = state.doc.lineAt(f).to;
-                        set.add(f, table, isolateLTR);
+                        pushDecoration(set, isolateLTR, f, table);
                     }
                     else {
                         td = f;
@@ -43,18 +44,18 @@ export const computeIsolates = ({ visibleRanges, state, textDirection }) => {
                     table = 0;
                 }
                 else if (td && name.includes(tokens.tableDelimiter2)) {
-                    set.add(td, f, isolateLTR);
+                    pushDecoration(set, isolateLTR, td, f);
                     td = 0;
                 }
                 else if (/-(?:template|parserfunction)-delimiter/u.test(name)) {
                     if (parameter) {
-                        set.add(parameter, f, isolate);
+                        pushDecoration(set, isolate, parameter, f);
                     }
                     parameter = t;
                 }
                 else if (parameter && /-(?:template|parserfunction)-bracket/u.test(name)) {
                     if (state.sliceDoc(f, f + 1) === '}') {
-                        set.add(parameter, f, isolate);
+                        pushDecoration(set, isolate, parameter, f);
                     }
                     parameter = 0;
                 }
@@ -62,7 +63,7 @@ export const computeIsolates = ({ visibleRanges, state, textDirection }) => {
             }
         }
     }
-    return set.finish();
+    return Decoration.set(set, true);
 };
 export default [
     ViewPlugin.fromClass(class {

package/dist/closeTags.d.ts

@@ -0,0 +1,3 @@
+import type { Extension } from '@codemirror/state';
+declare const _default: () => Extension;
+export default _default;

package/dist/closeTags.js

@@ -0,0 +1,31 @@
+import { EditorView } from '@codemirror/view';
+import { syntaxTree } from '@codemirror/language';
+import { getTag, searchTag } from './matchTag.js';
+import { hasTag } from './mediawiki.js';
+const brackets = ['extTagBracket', 'htmlTagBracket'];
+export default () => EditorView.inputHandler.of((view, from, to, text, insertTransaction) => {
+    if (view.composing || view.state.readOnly || from !== to || text !== '>') {
+        return false;
+    }
+    const base = insertTransaction(), { state } = base, tree = syntaxTree(state), closeTags = state.changeByRange(range => {
+        const didType = state.sliceDoc(range.from - 1, range.to) === text, { head } = range, after = tree.resolveInner(head, -1);
+        if (didType && hasTag(after.name, brackets) && head === after.from + 1) {
+            const tag = getTag(state, after.prevSibling);
+            if (tag && !tag.closing && !tag.selfClosing && !searchTag(state, tag)) {
+                return {
+                    range,
+                    changes: { from: head, to: head, insert: `</${tag.name}>` },
+                };
+            }
+        }
+        return { range };
+    });
+    if (closeTags.changes.empty) {
+        return false;
+    }
+    view.dispatch([
+        base,
+        state.update(closeTags, { userEvent: 'input.complete', scrollIntoView: true }),
+    ]);
+    return true;
+});

package/dist/codemirror.js

@@ -2,7 +2,7 @@ import { EditorView, lineNumbers, keymap, highlightActiveLineGutter } from '@cod
 import { EditorSelection, Compartment, EditorState, SelectionRange, } from '@codemirror/state';
 import { syntaxHighlighting, defaultHighlightStyle, indentOnInput, indentUnit, ensureSyntaxTree, syntaxTree, } from '@codemirror/language';
 import { defaultKeymap, historyKeymap, history, redo, indentWithTab, insertNewlineKeepIndent, deleteCharBackwardStrict, } from '@codemirror/commands';
-import { searchKeymap } from '@codemirror/search';
+import { search, searchKeymap } from '@codemirror/search';
 import { linter, lintGutter } from '@codemirror/lint';
 import elt from 'crelt';
 import { base, panelSelector, panelsSelector, diagnosticSelector, noDetectionLangs } from './constants.js';
@@ -33,7 +33,7 @@ export const optionalFunctions = {
         return () => { };
     },
 };
-const editExtensions = new Set(['closeBrackets', 'autocompletion', 'signatureHelp', 'escape']);
+const editExtensions = new Set(['closeBrackets', 'closeTags', 'autocompletion', 'signatureHelp', 'escape']);
 const linters = {};
 const phrases = {};
 /**
@@ -156,6 +156,23 @@ export class CodeMirror6 {
             EditorView.editorAttributes.of({ lang: l }),
             lineNumbers(),
             highlightActiveLineGutter(),
+            search({
+                scrollToMatch(range, view) {
+                    const scrollRect = view.scrollDOM.getBoundingClientRect(), startCoords = view.coordsAtPos(range.from), endCoords = view.coordsAtPos(range.to), isInViewport = startCoords && startCoords.top >= scrollRect.top
+                        && endCoords && endCoords.bottom <= scrollRect.bottom;
+                    return EditorView.scrollIntoView(range, { y: isInViewport ? 'nearest' : 'center' });
+                },
+            }),
+            EditorView.scrollHandler.of((view, { head }, options) => {
+                if (options.x === 'nearest' && options.y === 'center') {
+                    const { scrollDOM } = view, { clientHeight } = scrollDOM, { top, height } = view.lineBlockAt(head);
+                    if (height < clientHeight - options.yMargin * 2) {
+                        scrollDOM.scrollTop = top + (height - clientHeight) / 2;
+                    }
+                    options.y = 'nearest';
+                }
+                return false;
+            }),
             keymap.of([
                 ...defaultKeymap,
                 ...searchKeymap,
@@ -197,7 +214,7 @@ export class CodeMirror6 {
                 if (focusChanged) {
                     textarea.dispatchEvent(new FocusEvent(this.#view.hasFocus ? 'focus' : 'blur'));
                 }
-                if (selectionSet && this.lang === 'mediawiki'
+                GH: if (selectionSet && this.lang === 'mediawiki'
                     && ['localhost:8080', 'bhsd-harry.github.io'].includes(location.host)) {
                     const tree = syntaxTree(state), { head } = state.selection.main, { name } = tree.resolve(head), innerName = tree.resolveInner(head).name;
                     if (name !== innerName) {

package/dist/constants.d.ts

@@ -1,3 +1,4 @@
-export declare const base: Record<'CDN', string | undefined>, hoverSelector = ".cm-tooltip-hover-mw", diagnosticSelector = ".cm-diagnosticText-clickable", panelSelector = ".cm-panel", panelsSelector = ".cm-panels", actionSelector = ".cm-diagnosticAction", noDetectionLangs: Set<string>, bgDark = "#4c566a", matchingCls = "cm-matchingTag", nonmatchingCls = "cm-nonmatchingTag";
+import { Decoration } from '@codemirror/view';
+export declare const base: Record<'CDN', string | undefined>, hoverSelector = ".cm-tooltip-hover-mw", diagnosticSelector = ".cm-diagnosticText-clickable", panelSelector = ".cm-panel", panelsSelector = ".cm-panels", actionSelector = ".cm-diagnosticAction", doctagMark: Decoration, typeMark: Decoration, noDetectionLangs: Set<string>, bgDark = "#4c566a", matchingCls = "cm-matchingTag", nonmatchingCls = "cm-nonmatchingTag";
 export declare const isWMF: boolean;
 export declare const isMac: boolean;

package/dist/constants.js

@@ -1,5 +1,6 @@
+import { Decoration } from '@codemirror/view';
 import { wmf } from '@bhsd/common';
-export const base = { CDN: undefined }, hoverSelector = '.cm-tooltip-hover-mw', diagnosticSelector = '.cm-diagnosticText-clickable', panelSelector = '.cm-panel', panelsSelector = '.cm-panels', actionSelector = '.cm-diagnosticAction', noDetectionLangs = new Set(['plain', 'mediawiki']), bgDark = '#4c566a', matchingCls = 'cm-matchingTag', nonmatchingCls = 'cm-nonmatchingTag';
+export const base = { CDN: undefined }, hoverSelector = '.cm-tooltip-hover-mw', diagnosticSelector = '.cm-diagnosticText-clickable', panelSelector = '.cm-panel', panelsSelector = '.cm-panels', actionSelector = '.cm-diagnosticAction', doctagMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-doctag' }), typeMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-doctag-type' }), noDetectionLangs = new Set(['plain', 'mediawiki']), bgDark = '#4c566a', matchingCls = 'cm-matchingTag', nonmatchingCls = 'cm-nonmatchingTag';
 export const isWMF = /* @__PURE__ */ (() => typeof location === 'object'
     && new RegExp(String.raw `\.(?:${wmf})\.org$`, 'u').test(location.hostname))();
 export const isMac = /* @__PURE__ */ (() => {

package/dist/fold.js

@@ -5,7 +5,7 @@ import { getRegex } from '@bhsd/common';
 import elt from 'crelt';
 import { tokens } from './config.js';
 import { bgDark } from './constants.js';
-import { matchTag, getTag } from './matchTag.js';
+import { searchTag, getTag } from './matchTag.js';
 import { braceStackUpdate, sliceDoc } from './util.js';
 const getExtRegex = /* @__PURE__ */ getRegex(tag => new RegExp(`mw-tag-${tag}(?![a-z])`, 'u'));
 export const updateSelection = (pos, { to }) => Math.max(pos, to), updateAll = (pos, { from, to }) => from <= pos && to > pos ? to : pos;
@@ -80,10 +80,10 @@ export const foldable = (state, posOrNode, tree, refOnly = false) => {
             while (nextSibling && !(isExtBracket(nextSibling) && !regex.test(nextSibling.name))) {
                 ({ nextSibling } = nextSibling);
             }
-            const next = nextSibling?.nextSibling;
+            const next = nextSibling?.nextSibling, closing = next && getTag(state, next);
             // The closing bracket of the current extension tag
-            if (nextSibling && (!refOnly || next && refNames.has(getTag(state, next)?.name))) {
-                return { from: matchTag(state, nextSibling.to).end.to, to: nextSibling.from };
+            if (closing && (!refOnly || refNames.has(closing.name))) {
+                return { from: searchTag(state, closing).to, to: nextSibling.from };
             }
         }
         return false;
@@ -337,14 +337,17 @@ export const buildMarkers = (view) => {
 };
 const markers = /* @__PURE__ */ ViewPlugin.fromClass(class {
     constructor(view) {
+        this.tree = syntaxTree(view.state);
         this.markers = buildMarkers(view);
     }
     update({ docChanged, viewportChanged, startState, state, view }) {
+        const tree = syntaxTree(state);
         if (docChanged
             || viewportChanged
             || startState.facet(language) !== state.facet(language)
             || startState.field(foldState, false) !== state.field(foldState, false)
-            || syntaxTree(startState) !== syntaxTree(state)) {
+            || tree !== this.tree) {
+            this.tree = tree;
             this.markers = buildMarkers(view);
         }
     }

package/dist/html.js

@@ -4,9 +4,9 @@ import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
 import { cssLanguage } from '@codemirror/lang-css';
 import { LanguageSupport } from '@codemirror/language';
 import { cssCompletion } from './css.js';
-import { jsCompletion, markGlobalsPlugin } from './javascript.js';
+import { jsCompletion, markGlobalsAndDocTagPlugin } from './javascript.js';
 import { mediawikiBase } from './mediawiki.js';
-import { getLightHighlightStyle } from './theme.js';
+import { lightHighlightStyle } from './theme.js';
 export default (config, cm) => {
     const { language, support } = mediawikiBase(config), 
     /** @test */
@@ -30,8 +30,8 @@ export default (config, cm) => {
         jsCompletion,
         cssCompletion(),
         support,
-        getLightHighlightStyle(),
-        markGlobalsPlugin(cm),
+        lightHighlightStyle,
+        markGlobalsAndDocTagPlugin(cm),
     ]);
     Object.assign(langSupport, { nestedMWLanguage: language });
     return langSupport;

package/dist/index.d.ts

@@ -27,7 +27,10 @@ export declare const registerAllowMultipleSelections: () => void;
 export declare const registerAutocompletion: () => void;
 /** Register the `codeFolding` extension */
 export declare const registerCodeFolding: () => void;
-/** Register the `colorPicker` extension */
+/**
+ * Register the `colorPicker` extension
+ * @deprecated This function does nothing and will be removed in a future release
+ */
 export declare const registerColorPicker: () => void;
 /** Register all common extensions */
 export declare const registerCommonExtensions: () => void;
@@ -78,6 +81,8 @@ export declare const registerColorPickerForMediaWiki: () => void;
 export declare const registerBracketMatchingForMediaWiki: () => void;
 /** Register the `codeFolding` extension for MediaWiki */
 export declare const registerCodeFoldingForMediaWiki: () => void;
+/** Register the `closeTags` extension for MediaWiki */
+export declare const registerCloseTagsForMediaWiki: () => void;
 /**
  * Register MediaWiki core language support
  * @param articlePath article path (e.g., 'https://www.mediawiki.org/wiki/')
@@ -89,14 +94,21 @@ export declare const registerMediaWikiCore: (articlePath?: string, templatedata?
 export declare const registerHTML: () => void;
 /** Register the `bracketMatching` extension for mixed MediaWiki-HTML */
 export declare const registerBracketMatchingForHTML: () => void;
-/** Register the `closeBrackets` extension for mixed MediaWiki-HTML */
+/**
+ * Register the `closeBrackets` extension for mixed MediaWiki-HTML
+ * @deprecated This function does nothing and will be removed in a future release
+ */
 export declare const registerCloseBracketsForHTML: () => void;
+/** Register the `closeTags` extension for mixed MediaWiki-HTML */
+export declare const registerCloseTagsForHTML: () => void;
 /** Register the `colorPicker` extension for mixed MediaWiki-HTML */
 export declare const registerColorPickerForHTML: () => void;
 /** Register mixed MediaWiki-HTML core language support */
 export declare const registerHTMLCore: () => void;
 /** Register JavaScript language support */
 export declare const registerJavaScript: () => void;
+/** Register the `bracketMatching` extension for JavaScript */
+export declare const registerBracketMatchingForJavaScript: () => void;
 /** Register JavaScript core language support */
 export declare const registerJavaScriptCore: () => void;
 /** Register CSS language support */
@@ -115,8 +127,15 @@ export declare const registerLua: () => void;
 export declare const registerLuaCore: () => void;
 /** Register Vue language support */
 export declare const registerVue: () => void;
-/** Register the `closeBrackets` extension for Vue */
+/** Register the `bracketMatching` extension for Vue */
+export declare const registerBracketMatchingForVue: () => void;
+/**
+ * Register the `closeBrackets` extension for Vue
+ * @deprecated This function does nothing and will be removed in a future release
+ */
 export declare const registerCloseBracketsForVue: () => void;
+/** Register the `closeTags` extension for Vue */
+export declare const registerCloseTagsForVue: () => void;
 /** Register the `colorPicker` extension for Vue */
 export declare const registerColorPickerForVue: () => void;
 /** Register Vue core language support */

package/dist/index.js

@@ -8,6 +8,7 @@ import { abusefilter, analyzer } from '@bhsd/lezer-abusefilter';
 import { getLSP } from '@bhsd/browser';
 import { colorPicker } from '@bhsd/codemirror-css-color-picker';
 import bidiIsolates from './bidi.js';
+import closeTags from './closeTags.js';
 import { CodeMirror6, avail, languages, linterRegistry, destroyListeners, plain, optionalFunctions, themes, } from './codemirror.js';
 import mediawikiColorPicker from './color.js';
 import escapeKeymap from './escape.js';
@@ -27,7 +28,7 @@ import { tagModes, getStaticMwConfig } from './static.js';
 import statusBar from './statusBar.js';
 import css from './css.js';
 import html from './html.js';
-import javascript from './javascript.js';
+import javascript, { exclude } from './javascript.js';
 import lua from './lua.js';
 import vue from './vue.js';
 export { CodeMirror6 };
@@ -70,7 +71,7 @@ export const registerBracketMatching = () => {
 };
 /** Register the `closeBrackets` extension */
 export const registerCloseBrackets = () => {
-    registerExtension('closeBrackets', (e = []) => [closeBrackets(), e]);
+    registerExtension('closeBrackets', closeBrackets);
 };
 /** Register the `scrollPastEnd` extension */
 export const registerScrollPastEnd = () => {
@@ -100,12 +101,13 @@ export const registerAutocompletion = () => {
 export const registerCodeFolding = () => {
     registerExtension('codeFolding', codeFolding);
 };
-/** Register the `colorPicker` extension */
-export const registerColorPicker = () => {
-    registerExtension('colorPicker', (e = []) => e);
-};
-/** 注册所有通用扩展（除`colorPicker`） */
-const registerExtensions = () => {
+/**
+ * Register the `colorPicker` extension
+ * @deprecated This function does nothing and will be removed in a future release
+ */
+export const registerColorPicker = () => { };
+/** Register all common extensions */
+export const registerCommonExtensions = () => {
     registerHighlightSpecialChars();
     registerHighlightActiveLine();
     registerHighlightWhitespace();
@@ -118,15 +120,15 @@ const registerExtensions = () => {
     registerAutocompletion();
     registerCodeFolding();
 };
-/** Register all common extensions */
-export const registerCommonExtensions = () => {
-    registerExtensions();
-    registerColorPicker();
-};
+/**
+ * 各语言独立定义的扩展
+ * @param e 扩展
+ */
+const langExtension = (e = []) => e;
 function mediawikiOnly(ext) {
     return typeof ext === 'function'
         ? [(enable, cm) => enable ? ext(cm) : [], { mediawiki: true }]
-        : [(e = []) => e, { mediawiki: ext }];
+        : [langExtension, { mediawiki: ext }];
 }
 /**
  * 注册特定语言的扩展
@@ -135,7 +137,7 @@ function mediawikiOnly(ext) {
  * @param ext 扩展
  */
 const registerLangExtension = (lang, name, ext) => {
-    avail[name] ??= [() => []];
+    avail[name] ??= [langExtension];
     const addon = avail[name];
     addon[1] ??= {};
     addon[1][lang] = ext;
@@ -158,6 +160,7 @@ export const registerMediaWiki = (articlePath, templatedata) => {
     registerColorPickerForMediaWiki();
     registerBracketMatchingForMediaWiki();
     registerCodeFoldingForMediaWiki();
+    registerCloseTagsForMediaWiki();
 };
 /**
  * 注册MediaWiki专用扩展
@@ -231,6 +234,10 @@ export const registerCodeFoldingForMediaWiki = () => {
     registerLangExtension('mediawiki', 'codeFolding', mediawikiFold);
     optionalFunctions.foldHandler = foldHandler;
 };
+/** Register the `closeTags` extension for MediaWiki */
+export const registerCloseTagsForMediaWiki = () => {
+    registerLangExtension('mediawiki', 'closeTags', closeTags());
+};
 /**
  * 注册LintSource
  * @param lang 语言
@@ -265,19 +272,24 @@ export const registerHTML = () => {
     registerCommonExtensions();
     registerHTMLCore();
     registerBracketMatchingForHTML();
-    registerCloseBracketsForHTML();
+    registerCloseTagsForHTML();
     registerColorPickerForHTML();
 };
 /** Register the `bracketMatching` extension for mixed MediaWiki-HTML */
 export const registerBracketMatchingForHTML = () => {
     registerLangExtension('html', 'bracketMatching', [
-        {},
+        { exclude },
         tagMatchingState,
     ]);
 };
-/** Register the `closeBrackets` extension for mixed MediaWiki-HTML */
-export const registerCloseBracketsForHTML = () => {
-    registerLangExtension('html', 'closeBrackets', autoCloseTags);
+/**
+ * Register the `closeBrackets` extension for mixed MediaWiki-HTML
+ * @deprecated This function does nothing and will be removed in a future release
+ */
+export const registerCloseBracketsForHTML = () => { };
+/** Register the `closeTags` extension for mixed MediaWiki-HTML */
+export const registerCloseTagsForHTML = () => {
+    registerLangExtension('html', 'closeTags', autoCloseTags);
 };
 /** Register the `colorPicker` extension for mixed MediaWiki-HTML */
 export const registerColorPickerForHTML = () => {
@@ -291,8 +303,13 @@ export const registerHTMLCore = () => {
 };
 /** Register JavaScript language support */
 export const registerJavaScript = () => {
-    registerExtensions();
+    registerCommonExtensions();
     registerJavaScriptCore();
+    registerBracketMatchingForJavaScript();
+};
+/** Register the `bracketMatching` extension for JavaScript */
+export const registerBracketMatchingForJavaScript = () => {
+    registerLangExtension('javascript', 'bracketMatching', [{ exclude }]);
 };
 /** Register JavaScript core language support */
 export const registerJavaScriptCore = () => {
@@ -318,7 +335,7 @@ export const registerCSSCore = () => {
 };
 /** Register JSON language support */
 export const registerJSON = () => {
-    registerExtensions();
+    registerCommonExtensions();
     registerJSONCore();
 };
 /** Register JSON core language support */
@@ -329,7 +346,7 @@ export const registerJSONCore = () => {
 };
 /** Register Lua language support */
 export const registerLua = () => {
-    registerExtensions();
+    registerCommonExtensions();
     registerLuaCore();
 };
 /** Register Lua core language support */
@@ -342,12 +359,22 @@ export const registerLuaCore = () => {
 export const registerVue = () => {
     registerCommonExtensions();
     registerVueCore();
-    registerCloseBracketsForVue();
+    registerBracketMatchingForVue();
+    registerCloseTagsForVue();
     registerColorPickerForVue();
 };
-/** Register the `closeBrackets` extension for Vue */
-export const registerCloseBracketsForVue = () => {
-    registerLangExtension('vue', 'closeBrackets', autoCloseTags);
+/** Register the `bracketMatching` extension for Vue */
+export const registerBracketMatchingForVue = () => {
+    registerLangExtension('vue', 'bracketMatching', [{ exclude }]);
+};
+/**
+ * Register the `closeBrackets` extension for Vue
+ * @deprecated This function does nothing and will be removed in a future release
+ */
+export const registerCloseBracketsForVue = () => { };
+/** Register the `closeTags` extension for Vue */
+export const registerCloseTagsForVue = () => {
+    registerLangExtension('vue', 'closeTags', autoCloseTags);
 };
 /** Register the `colorPicker` extension for Vue */
 export const registerColorPickerForVue = () => {
@@ -361,7 +388,7 @@ export const registerVueCore = () => {
 };
 /** Register AbuseFilter language support */
 export const registerAbuseFilter = () => {
-    registerExtensions();
+    registerCommonExtensions();
     registerAbuseFilterCore();
 };
 /** Register AbuseFilter core language support */

package/dist/javascript.d.ts

@@ -5,11 +5,18 @@ import type { DocRange } from './fold';
 import type { CodeMirror6 } from './codemirror';
 export declare const jsCompletion: Extension;
 /**
- * 高亮显示全局变量
+ * 忽略JavaScript正则表达式中的括号匹配
+ * @param state
+ * @param pos 位置
+ * @test
+ */
+export declare const exclude: (state: EditorState, pos: number) => boolean;
+/**
+ * 高亮显示全局变量和JSDoc标签
  * @ignore
  * @test
  */
-export declare const markGlobals: (tree: Tree, visibleRanges: readonly DocRange[], state: EditorState, cm?: CodeMirror6) => DecorationSet;
-export declare const markGlobalsPlugin: (cm?: CodeMirror6) => Extension;
+export declare const markGlobalsAndDocTag: (tree: Tree, visibleRanges: readonly DocRange[], state: EditorState, cm?: CodeMirror6) => DecorationSet;
+export declare const markGlobalsAndDocTagPlugin: (cm?: CodeMirror6) => Extension;
 declare const _default: (_?: unknown, cm?: CodeMirror6) => Extension;
 export default _default;