@bhsd/codemirror-mediawiki 2.7.4 → 2.7.6

package/mw/preference.ts

@@ -2,6 +2,7 @@ import {rules} from 'wikiparser-node/dist/base';
 import {CodeMirror} from './base';
 import {msg, parseMsg, i18n, setObject, getObject} from './msg';
 import {instances} from './textSelection';
+import type {LintError} from 'wikiparser-node';
 import type {ApiEditPageParams, ApiQueryRevisionsParams} from 'types-mediawiki/api_params';
 
 const storageKey = 'codemirror-mediawiki-addons',
@@ -15,9 +16,20 @@ declare type codeKey = typeof codeKeys[number];
 declare type Preferences = {
 	addons?: string[];
 	indent?: string;
-	wikilint?: Record<Rule, RuleState>;
+	wikilint?: Record<LintError.Rule, RuleState>;
 } & Record<codeKey, unknown>;
 
+declare interface MediaWikiPage {
+	readonly revisions?: {
+		readonly content: string;
+	}[];
+}
+declare interface MediaWikiResponse {
+	readonly query: {
+		readonly pages: MediaWikiPage[];
+	};
+}
+
 const enum RuleState {
 	off = '0',
 	error = '1',
@@ -26,7 +38,7 @@ const enum RuleState {
 
 export const indentKey = 'codemirror-mediawiki-indent',
 	prefs = new Set<string>(getObject(storageKey) as string[] | null),
-	wikilintConfig = (getObject(wikilintKey) || {}) as Record<Rule, RuleState | undefined>,
+	wikilintConfig = (getObject(wikilintKey) || {}) as Record<LintError.Rule, RuleState | undefined>,
 	codeConfigs = new Map(codeKeys.map(k => [k, getObject(`codemirror-mediawiki-${k}`)]));
 
 // OOUI组件
@@ -36,7 +48,7 @@ let dialog: OO.ui.MessageDialog | undefined,
 	indentWidget: OO.ui.TextInputWidget,
 	indent = localStorage.getItem(indentKey) || '';
 const widgets: Partial<Record<codeKey, OO.ui.MultilineTextInputWidget>> = {},
-	wikilintWidgets = new Map<Rule, OO.ui.DropdownInputWidget>();
+	wikilintWidgets = new Map<LintError.Rule, OO.ui.DropdownInputWidget>();
 
 /**
  * 处理Api请求错误

package/mw/textSelection.ts

@@ -1,4 +1,4 @@
-import type {CodeMirror} from './base';
+import {CodeMirror} from './base';
 
 export const instances = new WeakMap<HTMLTextAreaElement, CodeMirror>();
 
@@ -8,6 +8,18 @@ export const instances = new WeakMap<HTMLTextAreaElement, CodeMirror>();
  */
 const getInstance = ($ele: JQuery<HTMLTextAreaElement>): CodeMirror => instances.get($ele[0]!)!;
 
+declare interface EncapsulateOptions {
+	pre?: string;
+	peri?: string;
+	post?: string;
+	ownline?: boolean;
+	replace?: boolean;
+	selectPeri?: boolean;
+	splitlines?: boolean;
+	selectionStart?: number;
+	selectionEnd?: number;
+}
+
 /**
  * jQuery.textSelection overrides for CodeMirror.
  * See jQuery.textSelection.js for method documentation
@@ -17,11 +29,7 @@ export const textSelection = {
 		return getInstance(this).view.state.doc.toString();
 	},
 	setContents(this: JQuery<HTMLTextAreaElement>, content: string): JQuery<HTMLTextAreaElement> {
-		const cm = getInstance(this),
-			{view: {scrollDOM}} = cm,
-			{scrollTop} = scrollDOM;
-		cm.setContent(content);
-		scrollDOM.scrollTop = scrollTop;
+		getInstance(this).setContent(content);
 		return this;
 	},
 	getSelection(this: JQuery<HTMLTextAreaElement>): string {
@@ -40,10 +48,65 @@ export const textSelection = {
 	},
 	replaceSelection(this: JQuery<HTMLTextAreaElement>, value: string): JQuery<HTMLTextAreaElement> {
 		const {view} = getInstance(this);
-		view.dispatch({selection: view.state.selection.asSingle()});
 		view.dispatch(view.state.replaceSelection(value));
 		return this;
 	},
+	encapsulateSelection(this: JQuery<HTMLTextAreaElement>, {
+		pre = '',
+		peri = '',
+		post = '',
+		ownline,
+		replace,
+		selectPeri = true,
+		splitlines,
+		selectionStart,
+		selectionEnd = selectionStart,
+	}: EncapsulateOptions): JQuery<HTMLTextAreaElement> {
+		const {view} = getInstance(this),
+			{state} = view;
+		const handleOwnline = (from: number, to: number, text: string): string => {
+			/* eslint-disable no-param-reassign */
+			if (from > 0 && !/[\n\r]/u.test(state.sliceDoc(from - 1, from))) {
+				text = `\n${text}`;
+				pre += '\n';
+			}
+			if (!/[\n\r]/u.test(state.sliceDoc(to, to + 1))) {
+				text += '\n';
+				post += '\n';
+			}
+			return text;
+			/* eslint-enable no-param-reassign */
+		};
+		if (ownline && replace && !pre && !post && selectionStart === undefined && /^\s*=.*=\s*$/u.test(peri)) {
+			// 单独处理改变标题层级
+			const {selection: {main: {from, to}}} = state,
+				insertText = handleOwnline(from, to, peri);
+			view.dispatch({
+				changes: {from, to, insert: insertText},
+				selection: {anchor: from + insertText.length},
+			});
+			return this;
+		}
+		CodeMirror.replaceSelections(view, (_, {from, to}) => {
+			if (selectionStart !== undefined) {
+				/* eslint-disable no-param-reassign */
+				from = selectionStart;
+				to = selectionEnd!;
+				/* eslint-enable no-param-reassign */
+			}
+			const isSample = selectPeri && from === to,
+				selText = replace || from === to ? peri : state.sliceDoc(from, to);
+			let insertText = splitlines
+				? selText.split('\n').map(line => `${pre}${line}${post}`).join('\n')
+				: `${pre}${selText}${post}`;
+			if (ownline) {
+				insertText = handleOwnline(from, to, insertText);
+			}
+			const head = insertText.length;
+			return isSample ? [insertText, pre.length, head - post.length] : [insertText, head];
+		});
+		return this;
+	},
 	getCaretPosition(this: JQuery<HTMLTextAreaElement>, option?: {startAndEnd?: boolean}): [number, number] | number {
 		const {view: {state: {selection: {main: {from, to, head}}}}} = getInstance(this);
 		return option?.startAndEnd ? [from, to] : head;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.7.4",
+	"version": "2.7.6",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",