From 73830a36872aa1c168c085dad8cc6e2e1a05ff45 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 13 Nov 2017 16:17:49 +0100 Subject: [PATCH] Fix #38215 --- .../services/configuration/node/configurationService.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts index 453ae3aee46..41ecbc09120 100644 --- a/src/vs/workbench/services/configuration/node/configurationService.ts +++ b/src/vs/workbench/services/configuration/node/configurationService.ts @@ -459,8 +459,12 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat this.registerConfigurationSchemas(); if (this.workspace && this._configuration) { this._configuration.updateDefaultConfiguration(this.defaultConfiguration); - this._configuration.updateWorkspaceConfiguration(this.workspaceConfiguration.reprocessWorkspaceSettings()); - this.workspace.folders.forEach(folder => this._configuration.updateFolderConfiguration(folder.uri, this.cachedFolderConfigs.get(folder.uri).reprocess())); + if (this.getWorkbenchState() === WorkbenchState.FOLDER) { + this._configuration.updateWorkspaceConfiguration(this.cachedFolderConfigs.get(this.workspace.folders[0].uri).reprocess()); + } else { + this._configuration.updateWorkspaceConfiguration(this.workspaceConfiguration.reprocessWorkspaceSettings()); + this.workspace.folders.forEach(folder => this._configuration.updateFolderConfiguration(folder.uri, this.cachedFolderConfigs.get(folder.uri).reprocess())); + } this.triggerConfigurationChange(new ConfigurationChangeEvent().change(keys), ConfigurationTarget.DEFAULT); } } -- GitLab