From fcffabad29b580dfadfd25ca1d1233db4c9479ff Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sandy081@Sushmithas-MacBook-Pro.local>
Date: Thu, 12 Sep 2019 23:27:16 +0200
Subject: [PATCH] add trailing comma to the remote change

---
 src/vs/workbench/services/userData/common/settingsSync.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/userData/common/settingsSync.ts b/src/vs/workbench/services/userData/common/settingsSync.ts
index f8b6b35d144..2b977404c00 100644
--- a/src/vs/workbench/services/userData/common/settingsSync.ts
+++ b/src/vs/workbench/services/userData/common/settingsSync.ts
@@ -368,7 +368,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
 			const tree = parseTree(settingsPreviewModel.getValue());
 			const valueNode = findNodeAtLocation(tree, [key]);
 			const remoteEdit = setProperty(`{${settingsPreviewModel.getEOL()}\t${settingsPreviewModel.getEOL()}}`, [key], remote[key], { tabSize: 4, insertSpaces: false, eol: settingsPreviewModel.getEOL() })[0];
-			const remoteContent = remoteEdit ? remoteEdit.content.substring(remoteEdit.offset + remoteEdit.length + 1) + settingsPreviewModel.getEOL() : '';
+			const remoteContent = remoteEdit ? `${remoteEdit.content.substring(remoteEdit.offset + remoteEdit.length + 1)},${settingsPreviewModel.getEOL()}` : '';
 			if (valueNode) {
 				// Updated in Local and Remote with different value
 				const keyPosition = settingsPreviewModel.getPositionAt(valueNode.parent!.offset);
-- 
GitLab