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

Use values util in map

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-09-24 00:01:47 +02:00
parent 0719e0ae42
commit f030ce94b6
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
import { Position } from 'vs/editor/common/core/position';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ISettingsMergeService } from 'vs/platform/userDataSync/common/userDataSync';
import { values } from 'vs/base/common/map';
class SettingsMergeService implements ISettingsMergeService {
@@ -42,7 +43,7 @@ class SettingsMergeService implements ISettingsMergeService {
const settingsPreviewModel = this.modelService.createModel(localContent, this.modeService.create('jsonc'));
// Removed settings in Local
for (const key of baseToLocal.removed.keys()) {
for (const key of values(baseToLocal.removed)) {
// Got updated in remote
if (baseToRemote.updated.has(key)) {
conflicts.add(key);
@@ -50,7 +51,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Removed settings in Remote
for (const key of baseToRemote.removed.keys()) {
for (const key of values(baseToRemote.removed)) {
if (conflicts.has(key)) {
continue;
}
@@ -63,7 +64,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Added settings in Local
for (const key of baseToLocal.added.keys()) {
for (const key of values(baseToLocal.added)) {
if (conflicts.has(key)) {
continue;
}
@@ -77,7 +78,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Added settings in remote
for (const key of baseToRemote.added.keys()) {
for (const key of values(baseToRemote.added)) {
if (conflicts.has(key)) {
continue;
}
@@ -93,7 +94,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Updated settings in Local
for (const key of baseToLocal.updated.keys()) {
for (const key of values(baseToLocal.updated)) {
if (conflicts.has(key)) {
continue;
}
@@ -107,7 +108,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Updated settings in Remote
for (const key of baseToRemote.updated.keys()) {
for (const key of values(baseToRemote.updated)) {
if (conflicts.has(key)) {
continue;
}
@@ -122,7 +123,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
}
for (const key of conflicts.keys()) {
for (const key of values(conflicts)) {
const tree = parseTree(settingsPreviewModel.getValue());
const valueNode = findNodeAtLocation(tree, [key]);
const eol = settingsPreviewModel.getEOL();