From 05f96d11819cb3d39872381d1315801b7f162b14 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 16 Jun 2017 12:45:54 +0200 Subject: [PATCH] #28538 Initialize all folder configurations at once --- .../workbench/services/configuration/node/configuration.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts index 8f299b58732..7aa393fc2ac 100644 --- a/src/vs/workbench/services/configuration/node/configuration.ts +++ b/src/vs/workbench/services/configuration/node/configuration.ts @@ -243,6 +243,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp private initCachesForFolders(folders: URI[]): void { for (const folder of folders) { this.cachedFolderConfigs.set(folder, new FolderConfiguration(folder, this.workspaceSettingsRootFolder, this.workspace)); + this._configuration.updateFolderConfiguration(folder, new FolderConfigurationModel(new FolderSettingsModel(null), []), false); } } @@ -484,11 +485,11 @@ class Configuration extends BaseConfiguration { return !this.equals(current); } - updateFolderConfiguration(resource: URI, configuration: FolderConfigurationModel): boolean { + updateFolderConfiguration(resource: URI, configuration: FolderConfigurationModel, compare: boolean = true): boolean { this.folders.set(resource, configuration); const current = this.getValue(null, { resource }); this.mergeFolder(resource); - return !objects.equals(current, this.getValue(null, { resource })); + return compare && !objects.equals(current, this.getValue(null, { resource })); } deleteFolderConfiguration(folder: URI): boolean { -- GitLab