@bhsd/codemirror-mediawiki 2.7.0 → 2.7.2

package/mw/preference.ts

@@ -59,7 +59,7 @@ const api = (async () => {
 	return undefined;
 })();
 
-const loadJSON = (async () => {
+export const loadJSON = (async () => {
 	if (!user) {
 		return;
 	}
@@ -75,6 +75,16 @@ const loadJSON = (async () => {
 			const {query: {pages: [page]}} = res as MediaWikiResponse;
 			if (page?.revisions) {
 				const json: Preferences = JSON.parse(page.revisions[0]!.content);
+				if (!json.addons?.includes('save')) {
+					return;
+				}
+				prefs.clear();
+				for (const option of json.addons) {
+					prefs.add(option);
+				}
+				if (json.indent) {
+					localStorage.setItem(indentKey, json.indent);
+				}
 				for (const key of codeKeys) {
 					if (json[key]) {
 						codeConfigs.set(key, json[key]);
@@ -83,15 +93,6 @@ const loadJSON = (async () => {
 				if (json.wikilint) {
 					Object.assign(wikilintConfig, json.wikilint);
 				}
-				if (json.addons) {
-					prefs.clear();
-					for (const option of json.addons) {
-						prefs.add(option);
-					}
-				}
-				if (json.indent) {
-					localStorage.setItem(indentKey, json.indent);
-				}
 			}
 		},
 		apiErr,
@@ -193,7 +194,8 @@ export const openPreference = async (editors: (CodeMirror | undefined)[]): Promi
 	}).closing as unknown as Promise<{action?: unknown} | undefined>);
 	if (typeof data === 'object' && data.action === 'accept') {
 		// 缩进
-		const oldIndent = indent;
+		const oldIndent = indent,
+			save = prefs.has('save');
 		indent = indentWidget.getValue(); // eslint-disable-line require-atomic-updates
 		let changed = indent !== oldIndent;
 		if (changed) {
@@ -203,20 +205,6 @@ export const openPreference = async (editors: (CodeMirror | undefined)[]): Promi
 			localStorage.setItem(indentKey, indent);
 		}
 
-		// 插件
-		const value = widget.getValue() as unknown as string[];
-		if (value.length !== prefs.size || !value.every(option => prefs.has(option))) {
-			changed = true;
-			prefs.clear();
-			for (const option of value) {
-				prefs.add(option);
-			}
-			for (const cm of editors) {
-				cm?.prefer(value);
-			}
-			setObject(storageKey, value);
-		}
-
 		// WikiLint
 		for (const [rule, dropdown] of wikilintWidgets) {
 			const val = dropdown.getValue() as RuleState;
@@ -241,8 +229,22 @@ export const openPreference = async (editors: (CodeMirror | undefined)[]): Promi
 			void OO.ui.alert(msg('json-error', jsonErrors.join(msg('and'))));
 		}
 
+		// 插件
+		const value = widget.getValue() as unknown as string[];
+		if (value.length !== prefs.size || !value.every(option => prefs.has(option))) {
+			changed = true;
+			prefs.clear();
+			for (const option of value) {
+				prefs.add(option);
+			}
+			for (const cm of editors) {
+				cm?.prefer(value);
+			}
+			setObject(storageKey, value);
+		}
+
 		// 保存至用户子页面
-		if (changed && user && prefs.has('save')) {
+		if (changed && user && (save || prefs.has('save'))) {
 			const params: ApiEditPageParams = {
 				action: 'edit',
 				title: userPage,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.7.0",
+	"version": "2.7.2",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -53,7 +53,7 @@
 		"@codemirror/state": "^6.4.1",
 		"@codemirror/view": "^6.24.1",
 		"@lezer/highlight": "^1.2.0",
-		"wikiparser-node": "^1.5.3"
+		"wikiparser-node": "^1.5.6"
 	},
 	"devDependencies": {
 		"@lezer/common": "^1.1.2",