Skip to content

Commit fcffaba

Browse files
Sandeep SomavarapuSandeep Somavarapu
authored andcommitted
add trailing comma to the remote change
1 parent 889c7a8 commit fcffaba

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/vs/workbench/services/userData/common/settingsSync.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
368368
const tree = parseTree(settingsPreviewModel.getValue());
369369
const valueNode = findNodeAtLocation(tree, [key]);
370370
const remoteEdit = setProperty(`{${settingsPreviewModel.getEOL()}\t${settingsPreviewModel.getEOL()}}`, [key], remote[key], { tabSize: 4, insertSpaces: false, eol: settingsPreviewModel.getEOL() })[0];
371-
const remoteContent = remoteEdit ? remoteEdit.content.substring(remoteEdit.offset + remoteEdit.length + 1) + settingsPreviewModel.getEOL() : '';
371+
const remoteContent = remoteEdit ? `${remoteEdit.content.substring(remoteEdit.offset + remoteEdit.length + 1)},${settingsPreviewModel.getEOL()}` : '';
372372
if (valueNode) {
373373
// Updated in Local and Remote with different value
374374
const keyPosition = settingsPreviewModel.getPositionAt(valueNode.parent!.offset);

0 commit comments

Comments
 (0)