Merge from vscode 718331d6f3ebd1b571530ab499edb266ddd493d5

2020-02-08 04:50:58 +00:00
parent 8c61538a27
commit 2af13c18d2
752 changed files with 16458 additions and 10063 deletions
@@ -89,7 +89,7 @@ export class ConfigurationModel implements IConfigurationModel {
 			contents[key] = contentsForKey;
 		}

-		return new ConfigurationModel(contents);
+		return new ConfigurationModel(contents, this.keys, this.overrides);
 	}

 	merge(...others: ConfigurationModel[]): ConfigurationModel {
@@ -516,7 +516,7 @@ export class Configuration {
 		const currentFolderConfiguration = this.folderConfigurations.get(resource);
 		const { added, updated, removed, overrides } = compare(currentFolderConfiguration, folderConfiguration);
 		let keys = [...added, ...updated, ...removed];
-		if (keys.length) {
+		if (keys.length || !currentFolderConfiguration) {
 			this.updateFolderConfiguration(resource, folderConfiguration);
 		}
 		return { keys, overrides };