Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-21 23:59:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prefer the markdown description in the preferences page (#152860)

Browse Source 
Fixes #152859

Co-authored-by: Anthony Stewart <anthonystewart@google.com>
This commit is contained in:
Anthony Stewart
2022-06-22 18:47:39 +01:00
committed by GitHub
parent 70392d7d51
commit a0067e5dbf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/preferences/common/preferencesModels.ts
+6 -6
View File
@@ -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,