提交 d0c114cd 编写于 作者: S Sandeep Somavarapu

fix #64319

上级 464a2e9b
......@@ -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);
}
}
......
......@@ -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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册