From a0067e5dbf2fdcdd06946c0c331b370d5bcbbdca Mon Sep 17 00:00:00 2001 From: Anthony Stewart <150152+a-stewart@users.noreply.github.com> Date: Wed, 22 Jun 2022 18:47:39 +0100 Subject: [PATCH] Prefer the markdown description in the preferences page (#152860) Fixes #152859 Co-authored-by: Anthony Stewart --- .../services/preferences/common/preferencesModels.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts index 4fff738137d..96d09e3a041 100644 --- a/src/vs/workbench/services/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts @@ -670,7 +670,7 @@ export class DefaultSettings extends Disposable { const prop = settingsObject[key]; if (this.matchesScope(prop)) { const value = prop.default; - let description = (prop.description || prop.markdownDescription || ''); + let description = (prop.markdownDescription || prop.description || ''); if (typeof description !== 'string') { description = ''; } @@ -690,12 +690,12 @@ export class DefaultSettings extends Disposable { const objectAdditionalProperties = prop.type === 'object' ? prop.additionalProperties : undefined; let enumToUse = prop.enum; - let enumDescriptions = prop.enumDescriptions ?? prop.markdownEnumDescriptions; - let enumDescriptionsAreMarkdown = !prop.enumDescriptions; + let enumDescriptions = prop.markdownEnumDescriptions ?? prop.enumDescriptions; + let enumDescriptionsAreMarkdown = !!prop.markdownEnumDescriptions; if (listItemType === 'enum' && !isArray(prop.items)) { enumToUse = prop.items!.enum; - enumDescriptions = prop.items!.enumDescriptions ?? prop.items!.markdownEnumDescriptions; - enumDescriptionsAreMarkdown = enumDescriptionsAreMarkdown && !prop.items!.enumDescriptions; + enumDescriptions = prop.items!.markdownEnumDescriptions ?? prop.items!.enumDescriptions; + enumDescriptionsAreMarkdown = !!prop.items!.markdownEnumDescriptions; } let allKeysAreBoolean = false; @@ -722,7 +722,7 @@ export class DefaultSettings extends Disposable { key, value, description: descriptionLines, - descriptionIsMarkdown: !prop.description, + descriptionIsMarkdown: !!prop.markdownDescription, range: nullRange, keyRange: nullRange, valueRange: nullRange,