Merge from vscode 27ada910e121e23a6d95ecca9cae595fb98ab568

This commit is contained in:
ADS Merger
2020-04-30 00:53:43 +00:00
parent 87e5239713
commit 93f35ca321
413 changed files with 7190 additions and 8756 deletions

View File

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