microsoft#96898 load unknown configurations always

sandy081 · sandy081 · commit 656920b1ea53 · 2020-05-06T10:23:43.000+02:00
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
@@ -324,17 +324,18 @@ export class ConfigurationModelParser {
 				result[key] = this.filterByScope(properties[key], configurationProperties, false, scopes);
 			} else {
 				const scope = this.getScope(key, configurationProperties);
-				if (scopes.indexOf(scope) !== -1) {
+				// Load unregistered configurations always.
+				if (scope === undefined || scopes.indexOf(scope) !== -1) {
 					result[key] = properties[key];
 				}
 			}
 		}
 		return result;
 	}
 
-	private getScope(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): ConfigurationScope {
+	private getScope(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): ConfigurationScope | undefined {
 		const propertySchema = configurationProperties[key];
-		return propertySchema && typeof propertySchema.scope !== 'undefined' ? propertySchema.scope : ConfigurationScope.WINDOW;
+		return propertySchema ? typeof propertySchema.scope !== 'undefined' ? propertySchema.scope : ConfigurationScope.WINDOW : undefined;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -324,17 +324,18 @@ export class ConfigurationModelParser {`
`324`	`324`	`result[key] = this.filterByScope(properties[key], configurationProperties, false, scopes);`
`325`	`325`	`} else {`
`326`	`326`	`const scope = this.getScope(key, configurationProperties);`
`327`		`- if (scopes.indexOf(scope) !== -1) {`
	`327`	`+ // Load unregistered configurations always.`
	`328`	`+ if (scope === undefined \|\| scopes.indexOf(scope) !== -1) {`
`328`	`329`	`result[key] = properties[key];`
`329`	`330`	`}`
`330`	`331`	`}`
`331`	`332`	`}`
`332`	`333`	`return result;`
`333`	`334`	`}`
`334`	`335`
`335`		`- private getScope(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): ConfigurationScope {`
	`336`	`+ private getScope(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): ConfigurationScope \| undefined {`
`336`	`337`	`const propertySchema = configurationProperties[key];`
`337`		`- return propertySchema && typeof propertySchema.scope !== 'undefined' ? propertySchema.scope : ConfigurationScope.WINDOW;`
	`338`	`+ return propertySchema ? typeof propertySchema.scope !== 'undefined' ? propertySchema.scope : ConfigurationScope.WINDOW : undefined;`
`338`	`339`	`}`
`339`	`340`	`}`
`340`	`341`