diff --git a/src/vs/platform/configuration/node/configurationService.ts b/src/vs/platform/configuration/node/configurationService.ts index fcd894e271f33ea24a3239458980a94398b9f17e..8073ba694de1f24cacc3d1df88785bd137815d8a 100644 --- a/src/vs/platform/configuration/node/configurationService.ts +++ b/src/vs/platform/configuration/node/configurationService.ts @@ -10,7 +10,6 @@ import { IConfigurationService, IConfigurationChangeEvent, IConfigurationOverrid import { DefaultConfigurationModel, Configuration, ConfigurationChangeEvent, ConfigurationModel } from 'vs/platform/configuration/common/configurationModels'; import { Event, Emitter } from 'vs/base/common/event'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import { equals } from 'vs/base/common/objects'; import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; import { UserConfiguration } from 'vs/platform/configuration/node/configuration'; @@ -92,16 +91,11 @@ export class ConfigurationService extends Disposable implements IConfigurationSe } private onDidChangeUserConfiguration(userConfigurationModel: ConfigurationModel): void { - let changedKeys: string[] = []; const { added, updated, removed } = compare(this._configuration.user, userConfigurationModel); - changedKeys = [...added, ...updated, ...removed]; + const changedKeys = [...added, ...updated, ...removed]; if (changedKeys.length) { - const oldConfiguartion = this._configuration; this._configuration.updateUserConfiguration(userConfigurationModel); - changedKeys = changedKeys.filter(key => !equals(oldConfiguartion.getValue(key, {}, null), this._configuration.getValue(key, {}, null))); - if (changedKeys.length) { - this.trigger(changedKeys, ConfigurationTarget.USER); - } + this.trigger(changedKeys, ConfigurationTarget.USER); } } diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts index e2ac963afba5e17651f10b351afc13961212081c..e770139423aecf3788b0ca9e31f1df265cfe3337 100644 --- a/src/vs/workbench/services/configuration/node/configurationService.ts +++ b/src/vs/workbench/services/configuration/node/configurationService.ts @@ -524,7 +524,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat } private onUserConfigurationChanged(userConfiguration: ConfigurationModel): void { - let keys = this._configuration.compareAndUpdateUserConfiguration(userConfiguration); + const keys = this._configuration.compareAndUpdateUserConfiguration(userConfiguration); this.triggerConfigurationChange(keys, ConfigurationTarget.USER); }