fix microsoft#79927

src/vs/editor/common/controller/cursor.ts

@@ -643,9 +643,17 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 					autoClosedEnclosingRanges.push(new Range(lineNumber, openCharIndex + 1, lineNumber, closeCharIndex + 2));
 				}
 			}
-			return cursorStateComputer(undoEdits);
+			const selections = cursorStateComputer(undoEdits);
+			if (selections) {
+				// Don't recover the selection from markers because
+				// we know what it should be.
+				this._isHandling = true;
+			}
+
+			return selections;
 		});
 		if (selections) {
+			this._isHandling = false;
 			this.setSelections(source, selections);
 		}
 		if (autoClosedCharactersRanges.length > 0) {

src/vs/workbench/api/browser/mainThreadSaveParticipant.ts

@@ -124,16 +124,12 @@ export class FinalNewLineParticipant implements ISaveParticipantParticipant {
 			return;
 		}
 
-		let prevSelection: Selection[] = [];
+		const edits = [EditOperation.insert(new Position(lineCount, model.getLineMaxColumn(lineCount)), model.getEOL())];
 		const editor = findEditor(model, this.codeEditorService);
 		if (editor) {
-			prevSelection = editor.getSelections();
-		}
-
-		model.pushEditOperations(prevSelection, [EditOperation.insert(new Position(lineCount, model.getLineMaxColumn(lineCount)), model.getEOL())], edits => prevSelection);
-
-		if (editor) {
-			editor.setSelections(prevSelection);
+			editor.executeEdits('insertFinalNewLine', edits, editor.getSelections());
+		} else {
+			model.pushEditOperations([], edits, () => null);
 		}
 	}
 }