Improve cursor positioning after moving

1 files changed, 14 insertions, 1 deletions

diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index 59ef98ecf97..1a0805bd378 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -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);
         });
     };
 }