Let markdownDeprecationMessage override deprecationMessage

roblourens · roblourens · commit b67444e6bb97 · 2020-04-27T21:46:52.000-05:00
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -328,6 +328,11 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 					this.configurationProperties[key] = properties[key];
 				}
 
+				if (!properties[key].deprecationMessage && properties[key].markdownDeprecationMessage) {
+					// If not set, default deprecationMessage to the markdown source
+					properties[key].deprecationMessage = properties[key].markdownDeprecationMessage;
+				}
+
 				propertyKeys.push(key);
 			}
 		}
diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -639,8 +639,8 @@ export class DefaultSettings extends Disposable {
 					tags: prop.tags,
 					disallowSyncIgnore: prop.disallowSyncIgnore,
 					extensionInfo: extensionInfo,
-					deprecationMessage: prop.deprecationMessage || prop.markdownDeprecationMessage,
-					deprecationMessageIsMarkdown: !prop.deprecationMessage,
+					deprecationMessage: prop.markdownDeprecationMessage || prop.deprecationMessage,
+					deprecationMessageIsMarkdown: !!prop.markdownDeprecationMessage,
 					validator: createValidator(prop)
 				});
 			}

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,11 @@ class ConfigurationRegistry implements IConfigurationRegistry {`
`328`	`328`	`this.configurationProperties[key] = properties[key];`
`329`	`329`	`}`
`330`	`330`
	`331`	`+ if (!properties[key].deprecationMessage && properties[key].markdownDeprecationMessage) {`
	`332`	`+ // If not set, default deprecationMessage to the markdown source`
	`333`	`+ properties[key].deprecationMessage = properties[key].markdownDeprecationMessage;`
	`334`	`+ }`
	`335`	`+`
`331`	`336`	`propertyKeys.push(key);`
`332`	`337`	`}`
`333`	`338`	`}`