Fixes #132156: Do not move cursor to the first non whitespace column when using revealCursor

This commit is contained in:
Alex Dima
2021-09-27 16:17:25 +02:00
parent 3fe0299742
commit 1e4e6aaa2e
@@ -381,14 +381,16 @@ export class CursorMoveCommands {
return new CursorState(cursor.modelState, cursor.viewState);
} else {
let newViewLineNumber: number;
if (viewLineNumber > visibleViewRange.endLineNumber - 1) {
viewLineNumber = visibleViewRange.endLineNumber - 1;
newViewLineNumber = visibleViewRange.endLineNumber - 1;
} else if (viewLineNumber < visibleViewRange.startLineNumber) {
newViewLineNumber = visibleViewRange.startLineNumber;
} else {
newViewLineNumber = viewLineNumber;
}
if (viewLineNumber < visibleViewRange.startLineNumber) {
viewLineNumber = visibleViewRange.startLineNumber;
}
const viewColumn = viewModel.getLineFirstNonWhitespaceColumn(viewLineNumber);
return this._moveToViewPosition(viewModel, cursor, inSelectionMode, viewLineNumber, viewColumn);
const position = MoveOperations.vertical(viewModel.cursorConfig, viewModel, viewLineNumber, cursor.viewState.position.column, cursor.viewState.leftoverVisibleColumns, newViewLineNumber, false);
return CursorState.fromViewState(cursor.viewState.move(inSelectionMode, position.lineNumber, position.column, position.leftoverVisibleColumns));
}
}