From 2ea7f1c69b451658d9aba79849e8c09202de9b44 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 19 Jun 2017 15:55:17 +0200 Subject: [PATCH] #28538 Initialize roots during configuration initialization --- .../services/configuration/node/configuration.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts index c459671ccc5..26bfcabe62e 100644 --- a/src/vs/workbench/services/configuration/node/configuration.ts +++ b/src/vs/workbench/services/configuration/node/configuration.ts @@ -182,7 +182,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp this.legacyWorkspace = this.workspace && this.workspace.roots.length ? new LegacyWorkspace(this.workspace.roots[0]) : null; - this._register(this.onDidUpdateConfiguration(e => this.resolveAdditionalFolders(true))); + this._register(this.onDidUpdateConfiguration(e => this.resolveAdditionalFolders())); this.baseConfigurationService = this._register(new GlobalConfigurationService(environmentService)); this._register(this.baseConfigurationService.onDidUpdateConfiguration(e => this.onBaseConfigurationChanged(e))); @@ -191,7 +191,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp this.initCaches(); } - private resolveAdditionalFolders(notify?: boolean): void { + private resolveAdditionalFolders(): void { if (!this.workspace) { return; // no additional folders for empty workspaces } @@ -222,9 +222,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp this.workspace.roots = configuredFolders; this.workspace.name = configuredFolders.map(root => basename(root.fsPath) || root.fsPath).join(', '); - if (notify) { - this._onDidChangeWorkspaceRoots.fire(configuredFolders); - } + this._onDidChangeWorkspaceRoots.fire(configuredFolders); } } @@ -312,7 +310,8 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp public initialize(): TPromise { this.initCaches(); - return this.doInitialize(this.workspace ? this.workspace.roots : []); + return this.doInitialize(this.workspace ? this.workspace.roots : []) + .then(() => this.trigger(this.workspace ? ConfigurationSource.Workspace : ConfigurationSource.User)); } private onRootsChanged(): void { -- GitLab