louis_lifu
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: compound language settings serialize incorrectly (#252539)

This commit is contained in:
Raymond Zhao 2025-06-26 13:13:03 -07:00 committed by GitHub
parent ee0fdc82a3
commit 96a6b409aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/platform/configuration/common/configuration.ts
View File

@ -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, ', ');
}

2
src/vs/platform/configuration/common/configurationRegistry.ts
View File

@ -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,

2
src/vs/workbench/contrib/preferences/browser/settingsTree.ts
View File

@ -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);
}

4
src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
View File

@ -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;
}