fix: compound language settings serialize incorrectly (#252539)

rzhao271 · web-flow · commit 96a6b409aacd · 2025-06-26T13:13:03.000-07:00
diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
@@ -347,5 +347,8 @@ export function merge(base: any, add: any, overwrite: boolean): void {
 }
 
 export function getLanguageTagSettingPlainKey(settingKey: string) {
-	return settingKey.replace(/[\[\]]/g, '');
+	return settingKey
+		.replace(/^\[/, '')
+		.replace(/]$/g, '')
+		.replace(/\]\[/g, ', ');
 }
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -472,7 +472,7 @@ class ConfigurationRegistry extends Disposable implements IConfigurationRegistry
 		const property: IRegisteredConfigurationPropertySchema = {
 			type: 'object',
 			default: newDefaultOverride.value,
-			description: nls.localize('defaultLanguageConfiguration.description', "Configure settings to be overridden for the {0} language.", getLanguageTagSettingPlainKey(key)),
+			description: nls.localize('defaultLanguageConfiguration.description', "Configure settings to be overridden for {0}.", getLanguageTagSettingPlainKey(key)),
 			$ref: resourceLanguageSettingsSchemaId,
 			defaultDefaultValue: newDefaultOverride.value,
 			source,
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -1179,7 +1179,7 @@ export class SettingComplexRenderer extends AbstractSettingRenderer implements I
 
 		const onClickOrKeydown = (e: UIEvent) => {
 			if (isLanguageTagSetting) {
-				this._onApplyFilter.fire(`@${LANGUAGE_SETTING_TAG}${plainKey}`);
+				this._onApplyFilter.fire(`@${LANGUAGE_SETTING_TAG}${plainKey.replaceAll(' ', '')}`);
 			} else {
 				this._onDidOpenSettings.fire(dataElement.setting.key);
 			}
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -11,7 +11,7 @@ import { escapeRegExpCharacters, isFalsyOrWhitespace } from '../../../../base/co
 import { isUndefinedOrNull } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { ConfigurationTarget, IConfigurationValue } from '../../../../platform/configuration/common/configuration.js';
+import { ConfigurationTarget, getLanguageTagSettingPlainKey, IConfigurationValue } from '../../../../platform/configuration/common/configuration.js';
 import { ConfigurationDefaultValueSource, ConfigurationScope, EditPresentationTypes, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -719,7 +719,7 @@ export function settingKeyToDisplayFormat(key: string, groupId: string = '', isL
 	category = wordifyKey(category);
 
 	if (isLanguageTagSetting) {
-		key = key.replace(/[\[\]]/g, '');
+		key = getLanguageTagSettingPlainKey(key);
 		key = '$(bracket) ' + key;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -347,5 +347,8 @@ export function merge(base: any, add: any, overwrite: boolean): void {`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`export function getLanguageTagSettingPlainKey(settingKey: string) {`
`350`		`- return settingKey.replace(/[\[\]]/g, '');`
	`350`	`+ return settingKey`
	`351`	`+ .replace(/^\[/, '')`
	`352`	`+ .replace(/]$/g, '')`
	`353`	`+ .replace(/\]\[/g, ', ');`
`351`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1179,7 +1179,7 @@ export class SettingComplexRenderer extends AbstractSettingRenderer implements I`
`1179`	`1179`
`1180`	`1180`	`const onClickOrKeydown = (e: UIEvent) => {`
`1181`	`1181`	`if (isLanguageTagSetting) {`
`1182`		- this._onApplyFilter.fire(`@${LANGUAGE_SETTING_TAG}${plainKey}`);
	`1182`	+ this._onApplyFilter.fire(`@${LANGUAGE_SETTING_TAG}${plainKey.replaceAll(' ', '')}`);
`1183`	`1183`	`} else {`
`1184`	`1184`	`this._onDidOpenSettings.fire(dataElement.setting.key);`
`1185`	`1185`	`}`