Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable keybindings synchronization

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-11-25 12:03:32 +01:00
parent 7be7110331
commit 63afb95647
9 changed files with 221 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/userDataSync/common/settingsMergeService.ts
View File

@@ -156,7 +156,7 @@ class SettingsMergeService implements ISettingsMergeService {
const remote = parse(remoteContent);
const remoteModel = this.modelService.createModel(localContent, this.modeService.create('jsonc'));
const ignored = ignoredSettings.reduce((set, key) => { set.add(key); return set; }, new Set<string>());
for (const key of Object.keys(ignoredSettings)) {
for (const key of ignoredSettings) {
if (ignored.has(key)) {
this.editSetting(remoteModel, key, undefined);
this.editSetting(remoteModel, key, remote[key]);