pi-vim 0.11.0 → 0.11.1

package/index.ts

@@ -1215,6 +1215,7 @@ export class ModalEditor extends CustomEditor {
     if ("insert" === this.mode) {
       this.clearUnderlyingPasteStateIfActive();
       this.setMode("normal");
+      if (this.getCursor().col > 0) this.moveCursorBy(-1);
     } else {
       super.handleInput("\x1b"); // pass escape to abort agent
     }
@@ -1996,6 +1997,12 @@ export class ModalEditor extends CustomEditor {
         this.setMode();
         this.moveCursorToFirstNonWhitespace();
         break;
+      case "$": {
+        const { line } = this.getCurrentLineAndCol();
+        const graphemes = getLineGraphemes(line);
+        this.moveCursorToCol(graphemes[graphemes.length - 1]?.start ?? 0);
+        break;
+      }
       case "o":
         this.openLineBelow();
         this.setMode();
@@ -2023,7 +2030,7 @@ export class ModalEditor extends CustomEditor {
         this.setMode();
         break;
       case "x":
-        this.cutCharUnderCursor();
+        this.cutCharUnderCursor(true);
         break;
       case "j":
         this.moveCursorVertically(1);
@@ -2655,7 +2662,7 @@ export class ModalEditor extends CustomEditor {
     return col >= line.length;
   }
 
-  private cutCharUnderCursor(): void {
+  private cutCharUnderCursor(normal: boolean = false): void {
     const count = Math.max(1, Math.min(MAX_COUNT, this.takeTotalCount(1)));
     const cursor = this.getCursor();
     const line = this.getLines()[cursor.line] ?? "";
@@ -2670,6 +2677,10 @@ export class ModalEditor extends CustomEditor {
         text.slice(lineStartAbs + range.end),
       lineStartAbs + range.start,
     );
+    if (normal) {
+      const { line, col } = this.getCurrentLineAndCol();
+      if (line && col >= line.length) this.moveCursorBy(-1);
+    }
   }
 
   private cutToEndOfLine(): void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-vim",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Vim-style modal editing for Pi's TUI editor",
   "type": "module",
   "keywords": [

package/types.ts

@@ -19,7 +19,7 @@ export const NORMAL_KEYS: Record<string, string | null> = {
   k: "\x1b[A", // up
   l: "\x1b[C", // right
   "0": "\x01", // line start
-  $: "\x05", // line end
+  $: null, // line end
   x: null, // delete char (custom clipboard handling)
   D: null, // delete to end of line (custom clipboard handling)
   C: null, // change to end of line (delete to end + insert mode)