fix horizontal movement in vspace after save

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to the "vscode-fake-virtual-space" extension will be documen
 ## 0.1.3
 
 - If saved file with fake vspace, offer to clean up and save again
+- Fix horizontal movement in vspace after save
 
 ## 0.1.2
 

src/extension.ts

@@ -12,13 +12,18 @@ let undoLock: Mutex;
 class DocumentState {
 	version:number
 	vspace:vscode.Position|undefined
+	ruinedUndoStopPosition:boolean=false
 	redos:Array<Array<[number,number,string]>>=[]
 	perturbedRedoStack:boolean=false
 	column:number|undefined
 	ruinedColumnHiddenState:boolean=false
 	constructor(version:number) {
 		this.version=version
 	}
+	resetVspace() {
+		this.vspace=undefined
+		this.ruinedUndoStopPosition=false
+	}
 	resetColumn() {
 		this.column=undefined
 		this.ruinedColumnHiddenState=false
@@ -45,6 +50,8 @@ export function activate(context: vscode.ExtensionContext) {
 	/*
 	vscode.workspace.onWillSaveTextDocument(event=>{
 		// could just run undo if was sure that document text is in focus, but there's no way to check it
+		// maybe could force focus, but that's unexpected behavior
+		// there's also 'Save All' then some documents are surely not in focus
 		// otherwise could do the following a cleanup edit, but it damages redo stack - we'd rather not do anything:
 		const lineRange=event.document.lineAt(state.vspace).range
 		const edit=vscode.TextEdit.delete(new vscode.Range(state.vspace,lineRange.end))
@@ -109,6 +116,7 @@ async function onDidChangeTextEditorSelectionListener(event:vscode.TextEditorSel
 
 async function onDidSaveTextDocumentListener(document:vscode.TextDocument) {
 	const state=getDocumentState(document)
+	state.ruinedUndoStopPosition=true
 	if (!state.vspace) return
 	vscode.window.showInformationMessage(
 		`Saved ${document.fileName} with fake virtual space`,
@@ -156,6 +164,11 @@ async function cursorHorizontalMove(moveCommand:string,moveDelta:number) {
 		const text=editor.document.lineAt(position).text
 		const state=getDocumentState(editor.document)
 		state.resetColumn()
+		if (state.vspace && state.ruinedUndoStopPosition && position.character>=text.length) {
+			const vspaceText=text.substr(state.vspace.character)
+			await cleanupVspace(editor)
+			await doVspace(editor,vspaceText)
+		}
 		if (moveDelta>0 && position.character<text.length) {
 			await vscode.commands.executeCommand(moveCommand)
 			return
@@ -338,7 +351,7 @@ async function cursorVerticalMoveWithWordWrap(editor:vscode.TextEditor,moveComma
 async function cleanupVspace(editor:vscode.TextEditor) {
 	const state=getDocumentState(editor.document)
 	if (!state.vspace) return
-	state.vspace=undefined
+	state.resetVspace()
 	await undoKeepingSelection(editor)
 	state.version=editor.document.version
 	state.ruinedColumnHiddenState=true
@@ -349,7 +362,7 @@ async function undoVspaceIfNotInside(editor:vscode.TextEditor) {
 	if (!state.vspace) return
 	const position=editor.selection.active
 	if (position.line==state.vspace.line && position.character>=state.vspace.character) return
-	state.vspace=undefined
+	state.resetVspace()
 	await undoKeepingSelection(editor)
 	state.version=editor.document.version
 	state.ruinedColumnHiddenState=true
@@ -388,7 +401,7 @@ async function undo() {
 		const state=getDocumentState(editor.document)
 		if (state.vspace) {
 			await vscode.commands.executeCommand('undo')
-			state.vspace=undefined
+			state.resetVspace()
 			state.resetColumn()
 			state.version=editor.document.version
 		}
@@ -432,7 +445,7 @@ async function redo() {
 		if (state.perturbedRedoStack && redo) {
 			if (state.vspace) {
 				await vscode.commands.executeCommand('undo')
-				state.vspace=undefined
+				state.resetVspace()
 				state.resetColumn()
 			}
 			await doRecordedRedo(editor,redo)

src/test/suite/extension.test.ts

@@ -322,6 +322,33 @@ suite("Extension Test Suite for normal settings",()=>{
 				await vscode.commands.executeCommand("workbench.action.closeActiveEditor")
 			}
 		})
+		test("handles horizontal vspace changes after save",async()=>{
+			const filename=`${__dirname}/vspace-save-and-horizontal-move-test.txt`
+			fs.writeFileSync(filename,"\n")
+			try {
+				const document=await vscode.workspace.openTextDocument(filename)
+				const editor=await vscode.window.showTextDocument(document)
+				try {
+					const startPosition=new vscode.Position(0,0)
+					editor.selection=new vscode.Selection(startPosition,startPosition)
+					assert.equal(document.getText(),"\n")
+					await vscode.commands.executeCommand("fakeVirtualSpace.cursorRight")
+					assert.equal(document.getText()," \n")
+					await vscode.commands.executeCommand("fakeVirtualSpace.cursorRight")
+					assert.equal(document.getText(),"  \n")
+					await document.save()
+					assert.equal(document.getText(),"  \n")
+					await vscode.commands.executeCommand("fakeVirtualSpace.cursorLeft")
+					assert.equal(document.getText()," \n")
+					await vscode.commands.executeCommand("fakeVirtualSpace.cursorDown")
+					assert.equal(document.getText(),"\n ")
+				} finally {
+					await vscode.commands.executeCommand("workbench.action.closeActiveEditor")
+				}
+			} finally {
+				fs.unlinkSync(filename)
+			}
+		})
 		/* making these work is too much trouble
 		test("cleans up vspace on save",async()=>{
 			const filename=`${__dirname}/vspace-save-cleanup-test.txt`