diff --git a/src/vs/workbench/services/userData/common/settingsSync.ts b/src/vs/workbench/services/userData/common/settingsSync.ts index f8b6b35d144b5c25242d3ab546270a106e79bf3a..2b977404c007e099c8e94bf9bda5b684e46f4d4f 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);