From 7c7df17989afccc851f3fd6caf73fa85ff7a9f6e Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 7 Dec 2016 08:47:18 +0100
Subject: [PATCH] files.insertFinalNewline should Not Move Cursor to New Line
 (fixes #16557)

---
 src/vs/workbench/api/node/mainThreadSaveParticipant.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/node/mainThreadSaveParticipant.ts b/src/vs/workbench/api/node/mainThreadSaveParticipant.ts
index d4a3b582ad9..fe2194d334d 100644
--- a/src/vs/workbench/api/node/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/node/mainThreadSaveParticipant.ts
@@ -121,7 +121,11 @@ export class FinalNewLineParticipant implements INamedSaveParticpant {
 			prevSelection = editor.getSelections();
 		}
 
-		model.pushEditOperations(prevSelection, [EditOperation.insert(new Position(lineCount + 1, 0), model.getEOL())], (edits) => prevSelection);
+		model.pushEditOperations(prevSelection, [EditOperation.insert(new Position(lineCount, model.getLineMaxColumn(lineCount)), model.getEOL())], edits => prevSelection);
+
+		if (editor) {
+			editor.setSelections(prevSelection);
+		}
 	}
 }