mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-24 07:44:10 +00:00
Improve cursor positioning after moving
This commit is contained in:
parent
f62944f416
commit
236abe2e60
@ -156,12 +156,25 @@ export function moveItem(ctx: Ctx, direction: ra.Direction): Cmd {
|
||||
|
||||
if (!edit) return;
|
||||
|
||||
let cursor: vscode.Position | null = null;
|
||||
|
||||
await editor.edit((builder) => {
|
||||
client.protocol2CodeConverter.asTextEdits(edit.edits).forEach((edit: any) => {
|
||||
builder.replace(edit.range, edit.newText);
|
||||
|
||||
if (direction === ra.Direction.Up) {
|
||||
if (!cursor || edit.range.end.isBeforeOrEqual(cursor)) {
|
||||
cursor = edit.range.end;
|
||||
}
|
||||
} else {
|
||||
if (!cursor || edit.range.end.isAfterOrEqual(cursor)) {
|
||||
cursor = edit.range.end;
|
||||
}
|
||||
}
|
||||
});
|
||||
}).then(() => {
|
||||
editor.selection = new vscode.Selection(editor.selection.end, editor.selection.end);
|
||||
const newPosition = cursor ?? editor.selection.start;
|
||||
editor.selection = new vscode.Selection(newPosition, newPosition);
|
||||
});
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user