@bhsd/codemirror-mediawiki 3.8.0 → 3.9.0

package/README.md

@@ -11,6 +11,8 @@ Here is a [demo](https://bhsd-harry.github.io/codemirror-mediawiki). To experime
 
 Nonetheless, this repository also provides a customized version with additional functionality for use on a MediaWiki site. Browser editing tools such as [Wikiplus-highlight](https://www.npmjs.com/package/wikiplus-highlight) and an [InPageEdit plugin](https://github.com/inpageedit/Plugins/blob/master/src/plugins/code-mirror/cm6.js) are built upon it. Please refer to a separate [README](./mw/README.md) file for the information.
 
+If you are just looking for a CodeMirror 6 language mode and language support extensions for MediaWiki Wikitext, you can use [@bhsd/codemirror-wikitext](https://www.npmjs.com/package/@bhsd/codemirror-wikitext) instead.
+
 <details>
 	<summary>Expand</summary>
 
@@ -45,6 +47,7 @@ Nonetheless, this repository also provides a customized version with additional
 	- [lint](#lint)
 	- [localize](#localize)
 	- [prefer](#prefer)
+	- [replaceSelections](#replaceselections)
 	- [scrollTo](#scrollto)
 	- [setContent](#setcontent)
 	- [setIndent](#setindent)
@@ -57,7 +60,7 @@ Nonetheless, this repository also provides a customized version with additional
 	- [CDN](#cdn)
 - [Static methods](#static-methods)
 	- [getMwConfig](#getmwconfig)
-	- [replaceSelections](#replaceselections)
+	- [replaceSelections](#replaceselections-static)
 - [Extensions](#extensions)
 	- [allowMultipleSelections](#allowmultipleselections)
 	- [autocompletion](#autocompletion)
@@ -309,6 +312,23 @@ import {registerMediaWiki} from '@bhsd/codemirror-mediawiki';
 registerMediaWiki();
 ```
 
+The MediaWiki mode provides the following key bindings for quick formatting:
+
+- `Ctrl` + `0`: Plain paragraph
+- `Ctrl` + `1-6`: Headings level 1 to 6
+- `Ctrl` + `7`: Preformatted text
+- `Ctrl` + `8`: Blockquote
+- `Ctrl`/`Cmd` + `/`: Comment
+- `Ctrl`/`Cmd` + `.`: Superscript
+- `Ctrl`/`Cmd` + `,`: Subscript
+- `Ctrl`/`Cmd` + `B`: Bold
+- `Ctrl`/`Cmd` + `I`: Italic
+- `Ctrl`/`Cmd` + `U`: Underline
+- `Ctrl`/`Cmd` + `K`: Wiki link
+- `Ctrl` + `Shift` + `5`: Strikethrough
+- `Ctrl`/`Cmd` + `Shift` + `6`: Inline code
+- `Ctrl`/`Cmd` + `Shift` + `K`: Ref tag
+
 If you want a more granular control over the extensions, you can import the `registerMediaWikiCore` function and the desired extensions:
 
 ```js
@@ -714,6 +734,22 @@ cm.prefer({
 
 </details>
 
+## replaceSelections
+
+<details>
+	<summary>Expand</summary>
+
+*version added: 3.9.0*
+
+**param**: `(str: string, range: {from: number, to: number}) => string | [string, number, number?]` the replacement function  
+Replace the selected text with the return value of the replacement function.
+
+```js
+cm.replaceSelections(str => str.toUpperCase());
+```
+
+</details>
+
 ## scrollTo
 
 <details>
@@ -884,7 +920,7 @@ const mwConfig = CodeMirror6.getMwConfig(config);
 
 </details>
 
-## replaceSelections
+## replaceSelections (static)
 
 <details>
 	<summary>Expand</summary>
@@ -930,6 +966,11 @@ registerAllowMultipleSelections();
 
 Provide autocompletion for MediaWiki, CSS and JavaScript modes.
 
+Key bindings:
+
+- `Shift` + `Enter`: Trigger autocompletion
+- `Tab`: Accept the selected suggestion
+
 For granular control over the bundled extensions, you can import the `registerAutocompletion` function:
 
 ```js
@@ -990,6 +1031,7 @@ Key bindings:
 - `Ctrl` + `Shift` + `]`/`Cmd` + `Alt` + `]`: Unfold at the selected text
 - `Ctrl` + `Alt` + `[`: Fold all
 - `Ctrl` + `Alt` + `]`: Unfold all
+- `Ctrl` + `Alt` + `.`: Fold all `<ref>` tags
 
 For granular control over the bundled extensions, you can import the `registerCodeFolding` function:
 
@@ -1029,6 +1071,7 @@ Key bindings:
 
 - `Ctrl`/`Cmd` + `[`: Escape the selected text with HTML entities
 - `Ctrl`/`Cmd` + `]`: Escape the selected text with URL encoding
+- `Ctrl`/`Cmd` + `\`: Escape the selected text with [magic words](https://www.mediawiki.org/wiki/Help:Magic_words#Escaped_characters)
 
 For granular control over the bundled extensions, you can import the `registerEscape` function:
 

package/dist/bidi.js

@@ -6,9 +6,9 @@
 import { EditorView, Direction, ViewPlugin, Decoration } from '@codemirror/view';
 import { Prec, RangeSetBuilder } from '@codemirror/state';
 import { syntaxTree } from '@codemirror/language';
-import { tokens } from './config';
-import { isolateSelector, ltrSelector } from './constants';
-import { getTag } from './matchTag';
+import { tokens } from './config.js';
+import { isolateSelector, ltrSelector } from './constants.js';
+import { getTag } from './matchTag.js';
 const cls = isolateSelector.slice(1), isolateLTR = Decoration.mark({
     class: `${cls} ${ltrSelector.slice(1)}`,
     bidiIsolate: Direction.LTR,

package/dist/codemirror.d.ts

@@ -14,6 +14,7 @@ import type { Selection } from './matchBrackets';
 export type AddonMain<T> = (config?: T, cm?: CodeMirror6) => Extension;
 export type Addon<T> = [AddonMain<T>, Record<string, T>?];
 export type Dialect = 'sanitized-css' | undefined;
+export type ReplaceFunction = (str: string, range: DocRange) => string | [string, number, number?];
 declare interface MenuItem {
     name: string;
     isActionable(this: void, cm: CodeMirror6): boolean;
@@ -32,6 +33,7 @@ export declare const menuRegistry: MenuItem[];
 export declare const destroyListeners: ((view: EditorView) => void)[];
 export declare const themes: Record<string, Extension>;
 export declare const optionalFunctions: OptionalFunctions;
+export declare const replaceSelections: (view: EditorView, func: ReplaceFunction) => void;
 /** CodeMirror 6 editor */
 export declare class CodeMirror6 {
     #private;
@@ -139,12 +141,18 @@ export declare class CodeMirror6 {
      * @since 3.3.0
      */
     setTheme(theme: string): void;
+    /**
+     * Replace the current selection with the result of a function
+     * @param func function to produce the replacement text
+     * @since 3.9.0
+     */
+    replaceSelections(func: ReplaceFunction): void;
     /**
      * Replace the current selection with the result of a function
      * @param view EditorView instance
      * @param func function to produce the replacement text
      */
-    static replaceSelections(view: EditorView, func: (str: string, range: DocRange) => string | [string, number, number?]): void;
+    static replaceSelections: (view: EditorView, func: ReplaceFunction) => void;
     /**
      * Convert a [WikiParser-Node](https://npmjs.com/package/wikiparser-node) configuration
      * to a CodeMirror-MediaWiki configuration

package/dist/codemirror.js

@@ -1,13 +1,19 @@
-import { EditorView, lineNumbers, keymap, highlightActiveLineGutter, } from '@codemirror/view';
-import { Compartment, EditorState, EditorSelection, SelectionRange } from '@codemirror/state';
+import { EditorView, lineNumbers, keymap, highlightActiveLineGutter } from '@codemirror/view';
+import { EditorSelection, Compartment, EditorState, SelectionRange, } from '@codemirror/state';
 import { syntaxHighlighting, defaultHighlightStyle, indentOnInput, indentUnit, ensureSyntaxTree, } from '@codemirror/language';
-import { defaultKeymap, historyKeymap, history, redo, indentWithTab } from '@codemirror/commands';
+import { defaultKeymap, historyKeymap, history, redo, indentWithTab, insertNewlineKeepIndent, deleteCharBackwardStrict, } from '@codemirror/commands';
 import { search, searchKeymap } from '@codemirror/search';
 import { linter, lintGutter, lintKeymap } from '@codemirror/lint';
 import elt from 'crelt';
-import { panelSelector, panelsSelector, diagnosticSelector } from './constants';
-import { light } from './theme';
-export const plain = () => EditorView.contentAttributes.of({ spellcheck: 'true' });
+import { base, panelSelector, panelsSelector, diagnosticSelector, noDetectionLangs } from './constants.js';
+import { light } from './theme.js';
+export const plain = () => [
+    EditorView.contentAttributes.of({ spellcheck: 'true' }),
+    keymap.of([
+        { key: 'Enter', run: insertNewlineKeepIndent, shift: insertNewlineKeepIndent },
+        { key: 'Backspace', run: deleteCharBackwardStrict, preventDefault: true },
+    ]),
+];
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const languages = { plain };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -30,14 +36,30 @@ export const optionalFunctions = {
 const editExtensions = new Set(['closeBrackets', 'autocompletion', 'signatureHelp']);
 const linters = {};
 const phrases = {};
+export const replaceSelections = (view, func) => {
+    const { state } = view;
+    view.dispatch(state.changeByRange(({ from, to }) => {
+        const result = func(state.sliceDoc(from, to), { from, to });
+        if (typeof result === 'string') {
+            return {
+                range: EditorSelection.range(from, from + result.length),
+                changes: { from, to, insert: result },
+            };
+        }
+        const [insert, start, end = start] = result;
+        return {
+            range: EditorSelection.range(start, end),
+            changes: { from, to, insert },
+        };
+    }));
+};
 /** CodeMirror 6 editor */
 export class CodeMirror6 {
-    static #CDN;
     static get CDN() {
-        return CodeMirror6.#CDN;
+        return base.CDN;
     }
     static set CDN(url) {
-        CodeMirror6.#CDN = url;
+        base.CDN = url;
     }
     #textarea;
     #language = new Compartment();
@@ -89,9 +111,13 @@ export class CodeMirror6 {
      * @param config 语言设置
      */
     #getLanguage(config) {
+        const isMW = this.#lang === 'mediawiki';
+        if (isMW || this.#lang === 'html') {
+            config ??= this.langConfig;
+        }
         const lang = (languages[this.#lang] ?? plain)(config);
         this.#nestedMWLanguage = lang.nestedMWLanguage;
-        if (this.#lang === 'mediawiki') {
+        if (isMW) {
             this.langConfig = config;
         }
         return lang;
@@ -111,7 +137,7 @@ export class CodeMirror6 {
             this.#phrases.of(EditorState.phrases.of(phrases)),
             this.#lineWrapping.of(EditorView.lineWrapping),
             this.#theme.of(light),
-            syntaxHighlighting(defaultHighlightStyle),
+            syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
             EditorView.contentAttributes.of({
                 accesskey: accessKey,
                 tabindex: String(tabIndex),
@@ -160,7 +186,7 @@ export class CodeMirror6 {
                         textarea.value = doc.toString();
                         textarea.dispatchEvent(new InputEvent('input'));
                     }, 400);
-                    if (!startDoc.toString().trim()) {
+                    if (!noDetectionLangs.has(this.#lang) && !startDoc.toString().trim()) {
                         this.setIndent(this.#indentStr);
                     }
                 }
@@ -251,7 +277,7 @@ export class CodeMirror6 {
                     const diagnostics = (await source(state)).map((diagnostic) => ({
                         ...diagnostic,
                         renderMessage(view) {
-                            const span = elt('span', { class: diagnosticSelector.slice(1) }, diagnostic.message);
+                            const span = elt('span', { class: diagnosticSelector.slice(1) }, diagnostic.renderMessage?.(view) ?? diagnostic.message);
                             span.addEventListener('click', () => {
                                 view.dispatch({
                                     selection: { anchor: diagnostic.from, head: diagnostic.to },
@@ -355,7 +381,7 @@ export class CodeMirror6 {
      * @param opt linter options
      */
     async getLinter(opt) {
-        return linterRegistry[this.#lang]?.(CodeMirror6.CDN, opt, this.#view, this.#nestedMWLanguage);
+        return linterRegistry[this.#lang]?.(opt, this.#view, this.#nestedMWLanguage);
     }
     /**
      * Set content
@@ -473,24 +499,18 @@ export class CodeMirror6 {
     }
     /**
      * Replace the current selection with the result of a function
-     * @param view EditorView instance
      * @param func function to produce the replacement text
+     * @since 3.9.0
      */
-    static replaceSelections(view, func) {
-        const { state } = view;
-        view.dispatch(state.changeByRange(({ from, to }) => {
-            const result = func(state.sliceDoc(from, to), { from, to });
-            if (typeof result === 'string') {
-                return {
-                    range: EditorSelection.range(from, from + result.length),
-                    changes: { from, to, insert: result },
-                };
-            }
-            const [insert, start, end = start] = result;
-            return {
-                range: EditorSelection.range(start, end),
-                changes: { from, to, insert },
-            };
-        }));
+    replaceSelections(func) {
+        if (this.#view) {
+            replaceSelections(this.#view, func);
+        }
     }
+    /**
+     * Replace the current selection with the result of a function
+     * @param view EditorView instance
+     * @param func function to produce the replacement text
+     */
+    static replaceSelections = replaceSelections;
 }

package/dist/color.d.ts

@@ -1,7 +1,6 @@
 import type { Text, Extension } from '@codemirror/state';
 import type { Tree } from '@lezer/common';
-import type { StyleSpec } from 'style-mod';
 import type { WidgetOptions } from '@bhsd/codemirror-css-color-picker';
 export declare const discoverColors: (_: Tree, from: number, to: number, type: string, doc: Text) => WidgetOptions[] | null;
-declare const _default: ([e, style]?: [Extension?, StyleSpec?]) => Extension;
+declare const _default: () => Extension;
 export default _default;

package/dist/color.js

@@ -1,6 +1,5 @@
 import { splitColors, numToHex } from '@bhsd/common';
-import { EditorView } from '@codemirror/view';
-import { parseCallExpression, parseColorLiteral, ColorType, wrapperClassName } from '@bhsd/codemirror-css-color-picker';
+import { parseCallExpression, parseColorLiteral, ColorType, colorPickerTheme, makeColorPicker, } from '@bhsd/codemirror-css-color-picker';
 export const discoverColors = (_, from, to, type, doc) => {
     if (!/mw-(?:(?:ext|html)tag-attribute-value|table-definition)/u.test(type)
         && (!/mw-(?:template|parserfunction)(?:$|_)/u.test(type)
@@ -27,17 +26,7 @@ export const discoverColors = (_, from, to, type, doc) => {
         };
     }).filter(options => options !== null);
 };
-export default (([e, style] = []) => e
-    ? [
-        e,
-        EditorView.theme({
-            [`.${wrapperClassName}`]: {
-                outline: 'none',
-                ...style,
-            },
-            [`.${wrapperClassName} input[type="color"]`]: {
-                outline: '1px solid #eee',
-            },
-        }),
-    ]
-    : []);
+export default () => [
+    makeColorPicker({ discoverColors }),
+    colorPickerTheme,
+];

package/dist/config.d.ts

@@ -90,11 +90,12 @@ tokens: {
     templateVariableBracket: string;
     templateVariableDelimiter: string;
     templateVariableName: string;
-}, 
+};
+export type TagName = keyof typeof tokens;
 /**
  * These are custom tokens (a.k.a. tags) that aren't mapped to any of the standardized tags.
  *
  * @see https://codemirror.net/docs/ref/#language.StreamParser.tokenTable
  * @see https://lezer.codemirror.net/docs/ref/#highlight.Tag%5Edefine
  */
-tokenTable: Record<string, Tag>;
+export declare const tokenTable: Record<string, Tag>;

package/dist/config.js

@@ -1,5 +1,7 @@
 // src/config.ts
-import { tags, Tag } from "@lezer/highlight";
+import {
+  Tag
+} from "@lezer/highlight";
 
 // ../wikiparser-node/config/default.json
 var html = [
@@ -151,18 +153,7 @@ var tokens = {
 };
 var tokenTable = /* @__PURE__ */ (() => {
   const table = {
-    variable: tags.variableName,
-    "variable-2": tags.special(tags.variableName),
-    "string-2": tags.special(tags.string),
-    def: tags.definition(tags.variableName),
-    tag: tags.tagName,
-    attribute: tags.attributeName,
-    type: tags.typeName,
-    builtin: tags.standard(tags.variableName),
-    qualifier: tags.modifier,
-    error: tags.invalid,
-    header: tags.heading,
-    property: tags.propertyName
+    //
   };
   for (const className of Object.values(tokens)) {
     table[className] = Tag.define();

package/dist/constants.d.ts

@@ -1 +1,2 @@
-export declare const panelSelector = ".cm-panel", panelsSelector = ".cm-panels", diagnosticSelector = ".cm-diagnosticText-clickable", foldSelector = ".cm-tooltip-fold", hoverSelector = ".cm-tooltip-hover", matchingCls = "cm-matchingTag", nonmatchingCls = "cm-nonmatchingTag", isolateSelector = ".cm-bidi-isolate", ltrSelector = ".cm-bidi-ltr", menuSelector = ".cm-status-fix-menu", messageSelector = ".cm-status-message", actionSelector = ".cm-diagnosticAction", isWMF: boolean, isMac: boolean;
+export declare const base: Record<'CDN', string | undefined>, hoverSelector = ".cm-tooltip-hover-mw", diagnosticSelector = ".cm-diagnosticText-clickable", panelSelector = ".cm-panel", panelsSelector = ".cm-panels", foldSelector = ".cm-tooltip-fold", isolateSelector = ".cm-bidi-isolate", ltrSelector = ".cm-bidi-ltr", menuSelector = ".cm-status-fix-menu", messageSelector = ".cm-status-message", actionSelector = ".cm-diagnosticAction", noDetectionLangs: Set<string>, matchingCls = "cm-matchingTag", nonmatchingCls = "cm-nonmatchingTag";
+export declare const isWMF: boolean, isMac: boolean;

package/dist/constants.js

@@ -1,5 +1,6 @@
 import { wmf } from '@bhsd/common';
-export const panelSelector = '.cm-panel', panelsSelector = '.cm-panels', diagnosticSelector = '.cm-diagnosticText-clickable', foldSelector = '.cm-tooltip-fold', hoverSelector = '.cm-tooltip-hover', matchingCls = 'cm-matchingTag', nonmatchingCls = 'cm-nonmatchingTag', isolateSelector = '.cm-bidi-isolate', ltrSelector = '.cm-bidi-ltr', menuSelector = '.cm-status-fix-menu', messageSelector = '.cm-status-message', actionSelector = '.cm-diagnosticAction', isWMF = /* @__PURE__ */ (() => typeof location === 'object'
+export const base = { CDN: undefined }, hoverSelector = '.cm-tooltip-hover-mw', diagnosticSelector = '.cm-diagnosticText-clickable', panelSelector = '.cm-panel', panelsSelector = '.cm-panels', foldSelector = '.cm-tooltip-fold', isolateSelector = '.cm-bidi-isolate', ltrSelector = '.cm-bidi-ltr', menuSelector = '.cm-status-fix-menu', messageSelector = '.cm-status-message', actionSelector = '.cm-diagnosticAction', noDetectionLangs = new Set(['plain', 'mediawiki']), matchingCls = 'cm-matchingTag', nonmatchingCls = 'cm-nonmatchingTag';
+export const isWMF = /* @__PURE__ */ (() => typeof location === 'object'
     && new RegExp(String.raw `\.(?:${wmf})\.org$`, 'u').test(location.hostname))(), isMac = /* @__PURE__ */ (() => {
     const { vendor, userAgent, maxTouchPoints, platform } = navigator;
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition

package/dist/escape.d.ts

@@ -1,5 +1,5 @@
-import { CodeMirror6 } from './codemirror';
 import type { Extension } from '@codemirror/state';
+import type { CodeMirror6 } from './codemirror';
 export declare const escapeHTML: (str: string) => string, escapeURI: (str: string) => string;
 declare const _default: (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/escape.js

@@ -3,7 +3,8 @@ import { EditorSelection } from '@codemirror/state';
 import { indentMore, indentLess } from '@codemirror/commands';
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
-import { CodeMirror6, menuRegistry } from './codemirror';
+import { base } from './constants.js';
+import { replaceSelections, menuRegistry, } from './codemirror.js';
 const entity = { '"': 'quot', "'": 'apos', '<': 'lt', '>': 'gt', '&': 'amp', ' ': 'nbsp' };
 /**
  * 根据函数转换选中文本
@@ -12,7 +13,7 @@ const entity = { '"': 'quot', "'": 'apos', '<': 'lt', '>': 'gt', '&': 'amp', ' '
  */
 const convert = (func, cmd) => (view) => {
     if (view.state.selection.ranges.some(({ empty }) => !empty)) {
-        CodeMirror6.replaceSelections(view, func);
+        replaceSelections(view, func);
         return true;
     }
     return cmd(view);
@@ -32,8 +33,8 @@ export const escapeHTML = (str) => [...str].map(c => {
     }
     return encodeURIComponent(str);
 };
-const escapeWiki = (cm) => {
-    const view = cm.view, { state } = view, { ranges } = state.selection, lsp = getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN);
+const escapeWiki = (view, getConfig) => {
+    const { state } = view, { ranges } = state.selection, lsp = getLSP(view, false, getConfig, base.CDN);
     if (lsp && 'provideRefactoringAction' in lsp && ranges.some(({ empty }) => !empty)) {
         (async () => {
             const replacements = new WeakMap();
@@ -71,19 +72,19 @@ menuRegistry.push({
         if (!items) {
             const view = cm.view, btnHTML = elt('div', 'HTML escape'), btnURI = elt('div', 'URI encode/decode');
             btnHTML.addEventListener('click', e => {
-                CodeMirror6.replaceSelections(view, escapeHTML);
+                replaceSelections(view, escapeHTML);
                 handlerBase(view, e);
             });
             btnURI.addEventListener('click', e => {
-                CodeMirror6.replaceSelections(view, escapeURI);
+                replaceSelections(view, escapeURI);
                 handlerBase(view, e);
             });
             items = [btnHTML, btnURI];
-            const lsp = getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN);
+            const lsp = getLSP(view, false, cm.getWikiConfig, base.CDN);
             if (lsp && 'provideRefactoringAction' in lsp) {
                 const btnWiki = elt('div', 'Escape with magic words');
                 btnWiki.addEventListener('click', e => {
-                    escapeWiki(cm);
+                    escapeWiki(view, cm.getWikiConfig);
                     handlerBase(view, e);
                 });
                 items.unshift(btnWiki);
@@ -97,8 +98,8 @@ export default (cm) => keymap.of([
     { key: 'Mod-]', run: convert(escapeURI, indentMore) },
     {
         key: 'Mod-\\',
-        run() {
-            return escapeWiki(cm);
+        run(view) {
+            return escapeWiki(view, cm.getWikiConfig);
         },
     },
 ]);

package/dist/fold.d.ts

@@ -15,7 +15,8 @@ export interface DocRange {
  */
 export declare const foldable: (state: EditorState, posOrNode: number | SyntaxNode, tree?: Tree | null, refOnly?: boolean) => DocRange | false;
 export declare const foldableLine: ({ state, viewport: { to: end }, viewportLineBlocks }: EditorView, { from: f, to: t }: DocRange) => DocRange | false;
-export declare const foldRef: Command, unfoldRef: Command;
+export declare const foldRef: Command;
+export declare const unfoldRef: Command;
 declare const _default: (e?: Extension | undefined) => Extension;
 export default _default;
 export declare const mediaWikiFold: Extension;

package/dist/fold.js

@@ -1,12 +1,12 @@
-import { showTooltip, keymap, GutterMarker, gutter, ViewPlugin, EditorView } from '@codemirror/view';
-import { StateField, RangeSetBuilder, RangeSet } from '@codemirror/state';
-import { syntaxTree, ensureSyntaxTree, foldEffect, unfoldEffect, foldedRanges, unfoldAll, codeFolding, foldGutter, foldKeymap, foldState, language, } from '@codemirror/language';
+import { keymap, GutterMarker, gutter, ViewPlugin, EditorView, showTooltip, } from '@codemirror/view';
+import { RangeSetBuilder, RangeSet, StateField, } from '@codemirror/state';
+import { syntaxTree, ensureSyntaxTree, foldEffect, unfoldEffect, foldedRanges, unfoldAll, codeFolding, foldState, language, foldGutter, foldKeymap, } from '@codemirror/language';
 import { getRegex } from '@bhsd/common';
 import elt from 'crelt';
-import { tokens } from './config';
-import { foldSelector } from './constants';
-import { matchTag, getTag } from './matchTag';
-import { braceStackUpdate } from './util';
+import { tokens } from './config.js';
+import { foldSelector } from './constants.js';
+import { matchTag, getTag } from './matchTag.js';
+import { braceStackUpdate } from './util.js';
 const getExtRegex = /* @__PURE__ */ getRegex(tag => new RegExp(`mw-tag-${tag}(?![a-z])`, 'u'));
 const updateSelection = (pos, { to }) => Math.max(pos, to), updateAll = (pos, { from, to }) => from <= pos && to > pos ? to : pos;
 /**
@@ -324,7 +324,8 @@ const foldCommand = (refOnly) => view => {
     const { state } = view, tree = ensureSyntaxTree(state, state.doc.length, 1e3) ?? syntaxTree(state), effects = [], anchor = traverse(state, tree, effects, tree.topNode.firstChild, Infinity, getAnchor(state), updateAll, refOnly);
     return execute(view, effects, anchor);
 };
-export const foldRef = /* @__PURE__ */ foldCommand(true), unfoldRef = (view) => {
+export const foldRef = /* @__PURE__ */ foldCommand(true);
+export const unfoldRef = (view) => {
     const { state } = view, tree = syntaxTree(state), effects = [];
     foldedRanges(state).between(0, state.doc.length, (i, j) => {
         const node = tree.resolve(i, -1);

package/dist/hover.d.ts

@@ -1,4 +1,4 @@
-import { CodeMirror6 } from './codemirror';
 import type { Extension } from '@codemirror/state';
+import type { CodeMirror6 } from './codemirror.js';
 declare const _default: (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/hover.js

@@ -1,14 +1,14 @@
 import { hoverTooltip, EditorView } from '@codemirror/view';
 import { ensureSyntaxTree } from '@codemirror/language';
-import { loadScript, getLSP } from '@bhsd/browser';
-import { tokens } from './config';
-import { hoverSelector } from './constants';
-import { CodeMirror6 } from './codemirror';
-import { escHTML, indexToPos, posToIndex, createTooltipView } from './util';
+import { getLSP, loadScript, } from '@bhsd/browser';
+import { tokens } from './config.js';
+import { base, hoverSelector } from './constants.js';
+import { indexToPos, posToIndex, createTooltipView, escHTML, } from './util.js';
 export default (cm) => [
     hoverTooltip(async (view, pos, side) => {
-        const { state } = view, { doc } = state, { paramSuggest, tags } = cm.langConfig;
-        let hover = await getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN)
+        const { state } = view, { doc } = state;
+        const { paramSuggest, tags } = cm.langConfig;
+        let hover = await getLSP(view, false, cm.getWikiConfig, base.CDN)
             ?.provideHover(doc.toString(), indexToPos(doc, pos));
         if (!hover && paramSuggest && 'templatedata' in tags) {
             const node = ensureSyntaxTree(state, pos + Math.max(side, 0))?.resolve(pos, side);
@@ -29,7 +29,7 @@ export default (cm) => [
             }
         }
         if (hover) {
-            const { CDN = '' } = CodeMirror6;
+            const { CDN = '' } = base;
             await loadScript(`${CDN}${CDN && '/'}npm/marked/lib/marked.umd.js`, 'marked', true);
             const { end } = hover.range;
             return {
@@ -60,6 +60,7 @@ export default (cm) => [
             lineHeight: 1.4,
         },
         [`${hoverSelector} code`]: {
+            color: 'inherit',
             padding: '.1em .4em',
             borderRadius: '.4em',
         },

package/dist/html.js

@@ -2,12 +2,12 @@ import { configureNesting } from '@lezer/html';
 import { htmlLanguage, htmlCompletionSourceWith } from '@codemirror/lang-html';
 import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
 import { cssLanguage } from '@codemirror/lang-css';
-import { LanguageSupport } from '@codemirror/language';
-import { cssCompletion } from './css';
-import { jsCompletion } from './javascript';
-import { mediawiki } from './mediawiki';
+import { LanguageSupport, syntaxHighlighting, defaultHighlightStyle, HighlightStyle } from '@codemirror/language';
+import { cssCompletion } from './css.js';
+import { jsCompletion } from './javascript.js';
+import { mediawikiBase } from './mediawiki.js';
 export default (config) => {
-    const { language, support } = mediawiki(config), lang = new LanguageSupport(htmlLanguage.configure({
+    const { language, support } = mediawikiBase(config), lang = new LanguageSupport(htmlLanguage.configure({
         wrap: configureNesting([
             { tag: 'script', parser: javascriptLanguage.parser },
             { tag: 'style', parser: cssLanguage.parser },
@@ -25,6 +25,7 @@ export default (config) => {
         jsCompletion,
         cssCompletion(),
         support,
+        syntaxHighlighting(HighlightStyle.define(defaultHighlightStyle.specs, { themeType: 'light' })),
     ]);
     Object.assign(lang, { nestedMWLanguage: language });
     return lang;

package/dist/indent.js

@@ -1,4 +1,4 @@
-const noDetectionLangs = new Set(['plain', 'mediawiki']);
+import { noDetectionLangs } from './constants.js';
 const getLines = (text) => text.children?.flatMap(getLines) ?? text.text;
 /**
  * 检测文本的缩进方式

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CodeMirror6 } from './codemirror';
+import { CodeMirror6 } from './codemirror.js';
 import type { Extension } from '@codemirror/state';
 import type { LanguageSupport } from '@codemirror/language';
 import type { LintSourceGetter } from './lintsource';
@@ -102,4 +102,4 @@ export declare const registerLanguage: (name: string, lang: (config?: unknown) =
  */
 export declare const registerLanguageCore: (name: string, lang: (config?: unknown) => LanguageSupport, lintSource?: LintSourceGetter) => void;
 export declare const registerTheme: (name: string, theme: Extension) => void;
-export { nord } from './theme';
+export { nord } from './theme.js';