Merge pull request #108120 from ryanclarke:106737-enumdescriptions-in-settings-ui

Add new property to IConfigurationPropertySchema

src/vs/platform/configuration/common/configurationRegistry.ts

@@ -113,6 +113,7 @@ export interface IConfigurationPropertySchema extends IJSONSchema {
 	included?: boolean;
 	tags?: string[];
 	disallowSyncIgnore?: boolean;
+	enumItemLabels?: string[];
 }
 
 export interface IConfigurationExtensionInfo {

src/vs/workbench/contrib/files/browser/files.contribution.ts

@@ -248,7 +248,8 @@ configurationRegistry.registerConfiguration({
 			'default': 'utf8',
 			'description': nls.localize('encoding', "The default character set encoding to use when reading and writing files. This setting can also be configured per language."),
 			'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE,
-			'enumDescriptions': Object.keys(SUPPORTED_ENCODINGS).map(key => SUPPORTED_ENCODINGS[key].labelLong)
+			'enumDescriptions': Object.keys(SUPPORTED_ENCODINGS).map(key => SUPPORTED_ENCODINGS[key].labelLong),
+			'enumItemLabels': Object.keys(SUPPORTED_ENCODINGS).map(key => SUPPORTED_ENCODINGS[key].labelLong)
 		},
 		'files.autoGuessEncoding': {
 			'type': 'boolean',

src/vs/workbench/contrib/preferences/browser/settingsTree.ts

@@ -1318,6 +1318,7 @@ export class SettingEnumRenderer extends AbstractSettingRenderer implements ITre
 	}
 
 	protected renderValue(dataElement: SettingsTreeSettingElement, template: ISettingEnumItemTemplate, onChange: (value: string) => void): void {
+		const enumItemLabels = dataElement.setting.enumItemLabels;
 		const enumDescriptions = dataElement.setting.enumDescriptions;
 		const enumDescriptionsAreMarkdown = dataElement.setting.enumDescriptionsAreMarkdown;
 
@@ -1327,9 +1328,11 @@ export class SettingEnumRenderer extends AbstractSettingRenderer implements ITre
 		const displayOptions = dataElement.setting.enum!
 			.map(String)
 			.map(escapeInvisibleChars)
-			.map((data, index) => <ISelectOptionItem>{
-				text: data,
-				description: (enumDescriptions && enumDescriptions[index] && (enumDescriptionsAreMarkdown ? fixSettingLinks(enumDescriptions[index], false) : enumDescriptions[index])),
+			.map((data, index) => {
+				const description = (enumDescriptions && enumDescriptions[index] && (enumDescriptionsAreMarkdown ? fixSettingLinks(enumDescriptions[index], false) : enumDescriptions[index]));
+				return <ISelectOptionItem>{
+					text: enumItemLabels && enumItemLabels[index] ? enumItemLabels[index] : data,
+					description: enumItemLabels && enumItemLabels[index] ? `[${data}] ${description}` : description,
 					descriptionIsMarkdown: enumDescriptionsAreMarkdown,
 					descriptionMarkdownActionHandler: {
 						callback: (content) => {
@@ -1338,6 +1341,7 @@ export class SettingEnumRenderer extends AbstractSettingRenderer implements ITre
 						disposeables: disposables
 					},
 					decoratorRight: (data === dataElement.defaultValue ? localize('settings.Default', "default") : '')
+				};
 			});
 
 		template.selectBox.setOptions(displayOptions);

src/vs/workbench/services/preferences/common/preferences.ts

@@ -76,6 +76,7 @@ export interface ISetting {
 	disallowSyncIgnore?: boolean;
 	extensionInfo?: IConfigurationExtensionInfo;
 	validator?: (value: any) => string | null;
+	enumItemLabels?: string[];
 }
 
 export interface IExtensionSetting extends ISetting {

src/vs/workbench/services/preferences/common/preferencesModels.ts

@@ -646,7 +646,8 @@ export class DefaultSettings extends Disposable {
 					extensionInfo: extensionInfo,
 					deprecationMessage: prop.markdownDeprecationMessage || prop.deprecationMessage,
 					deprecationMessageIsMarkdown: !!prop.markdownDeprecationMessage,
-					validator: createValidator(prop)
+					validator: createValidator(prop),
+					enumItemLabels: prop.enumItemLabels
 				});
 			}
 		}