cliedit 0.1.0 → 0.1.2

package/dist/editor.keys.js

@@ -8,19 +8,34 @@ function handleKeypressEvent(ch, key) {
     if (this.isExiting) {
         return;
     }
-    // CRASH FIX: Handle case where 'key' is undefined (a normal character key)
+    let keyName = undefined;
+    let edited = false;
+    // --- 1. Xử lý trường hợp key là null/undefined (Ký tự in được) ---
     if (!key) {
-        if (ch && ch >= ' ' && ch <= '~') {
-            this.handleCharacterKey(ch);
-            this.recalculateVisualRows();
+        if (ch && ch.length === 1 && ch >= ' ' && ch <= '~') {
+            if (this.mode === 'search_find' || this.mode === 'search_replace') {
+                this.handleSearchKeys(ch);
+            }
+            else if (this.mode === 'goto_line') {
+                this.handleGoToLineKeys(ch);
+            }
+            else if (this.mode === 'edit') {
+                edited = this.handleEditKeys(ch);
+                if (edited) {
+                    this.saveState();
+                    this.recalculateVisualRows(); // Phải tính toán lại sau khi gõ
+                }
+            }
+            else if (this.mode === 'search_confirm') {
+                this.handleSearchConfirmKeys(ch);
+            }
             this.render();
+            return;
         }
         return;
     }
-    // --- From here, 'key' object is guaranteed to exist ---
-    let keyName = undefined;
-    let edited = false;
-    // 1. Map Control sequences (Ctrl+Arrow for selection)
+    // --- 2. Từ đây, 'key' object là đảm bảo có (phím đặc biệt hoặc Ctrl/Meta) ---
+    // 2.1. Ánh xạ Control sequences (Ctrl+Arrow cho selection)
     if (key.ctrl) {
         if (key.name === 'up')
             keyName = KEYS.CTRL_ARROW_UP;
@@ -31,10 +46,10 @@ function handleKeypressEvent(ch, key) {
         else if (key.name === 'right')
             keyName = KEYS.CTRL_ARROW_RIGHT;
         else
-            keyName = key.sequence; // Use sequence for Ctrl+S, Ctrl+C, etc.
+            keyName = key.sequence;
     }
     else {
-        // 2. (FIXED) Map standard navigation keys (Arrow, Home, End)
+        // 2.2. Ánh xạ phím tiêu chuẩn (Arrow, Home, End, Enter, Tab)
         if (key.name === 'up')
             keyName = KEYS.ARROW_UP;
         else if (key.name === 'down')
@@ -60,55 +75,47 @@ function handleKeypressEvent(ch, key) {
         else if (key.name === 'tab')
             keyName = KEYS.TAB;
         else
-            keyName = key.sequence; // Fallback
+            keyName = key.sequence;
     }
-    // 3. (FIXED) Handle printable characters immediately
-    // This was the source of the "no typing" bug.
-    // We must check for characters *before* routing to handleEditKeys.
-    if (keyName && keyName.length === 1 && keyName >= ' ' && keyName <= '~' && !key.ctrl && !key.meta) {
-        this.handleCharacterKey(keyName);
-        this.recalculateVisualRows();
-        this.render();
-        return;
-    }
-    // 4. Mode Routing (If it's not a character, it's a command)
-    if (this.mode === 'search') {
+    // --- 3. Định tuyến theo Mode ---
+    if (this.mode === 'search_find' || this.mode === 'search_replace') {
         this.handleSearchKeys(keyName || ch);
     }
+    else if (this.mode === 'search_confirm') {
+        this.handleSearchConfirmKeys(keyName || ch);
+    }
+    else if (this.mode === 'goto_line') {
+        this.handleGoToLineKeys(keyName || ch);
+    }
     else {
-        // 5. Handle Selection Keys (Ctrl+Arrow)
+        // 4. Xử lý phím lựa chọn (Ctrl+Arrow) - Navigation
         switch (keyName) {
             case KEYS.CTRL_ARROW_UP:
-                this.startOrUpdateSelection();
-                this.moveCursorVisually(-1);
-                this.render();
-                return;
             case KEYS.CTRL_ARROW_DOWN:
-                this.startOrUpdateSelection();
-                this.moveCursorVisually(1);
-                this.render();
-                return;
             case KEYS.CTRL_ARROW_LEFT:
-                this.startOrUpdateSelection();
-                this.moveCursorLogically(-1);
-                this.render();
-                return;
             case KEYS.CTRL_ARROW_RIGHT:
                 this.startOrUpdateSelection();
-                this.moveCursorLogically(1);
+                if (keyName === KEYS.CTRL_ARROW_UP)
+                    this.moveCursorVisually(-1);
+                else if (keyName === KEYS.CTRL_ARROW_DOWN)
+                    this.moveCursorVisually(1);
+                else if (keyName === KEYS.CTRL_ARROW_LEFT)
+                    this.moveCursorLogically(-1);
+                else if (keyName === KEYS.CTRL_ARROW_RIGHT)
+                    this.moveCursorLogically(1);
                 this.render();
                 return;
         }
-        // 6. Handle all other command keys (Editing/Commands)
+        // 5. Xử lý tất cả các phím lệnh/chỉnh sửa khác
         edited = this.handleEditKeys(keyName || ch);
     }
-    // 7. State Update and Render
+    // 6. Cập nhật Trạng thái và Render
     if (edited) {
-        this.saveState();
-        this.recalculateVisualRows();
+        this.saveState(); // <-- Chỉ gọi khi gõ phím, xóa, v.v.
+        this.recalculateVisualRows(); // Tính toán lại layout
     }
     if (!this.isExiting) {
-        this.render();
+        this.render(); // Render cuối cùng (với visual rows đã được cập nhật nếu cần)
     }
 }
 /**
@@ -116,10 +123,6 @@ function handleKeypressEvent(ch, key) {
  * Returns true if content was modified.
  */
 function handleEditKeys(key) {
-    // (FIXED) Removed the guard clause that was blocking typing.
-    // if (key.length === 1 && key >= ' ' && key <= '~') {
-    //     return false;
-    // }
     // Cancel selection on normal navigation
     const isNavigation = [
         KEYS.ARROW_UP, KEYS.ARROW_DOWN, KEYS.ARROW_LEFT, KEYS.ARROW_RIGHT,
@@ -131,7 +134,6 @@ function handleEditKeys(key) {
             this.setStatusMessage(this.DEFAULT_STATUS, 0);
         }
     }
-    // Commands that return Promises must be wrapped in a sync call here
     switch (key) {
         // --- Exit / Save ---
         case KEYS.CTRL_Q:
@@ -143,7 +145,7 @@ function handleEditKeys(key) {
         case KEYS.CTRL_C:
             this.handleCopy();
             return false;
-        // --- Navigation ---
+        // --- Navigation (Non-Selection) ---
         case KEYS.ARROW_UP:
             this.moveCursorVisually(-1);
             return false;
@@ -189,17 +191,27 @@ function handleEditKeys(key) {
             return true;
         // --- Search & History ---
         case KEYS.CTRL_W:
-            this.enterSearchMode();
+            this.enterFindMode();
+            return false;
+        case KEYS.CTRL_R:
+            this.enterReplaceMode();
+            return false;
+        case KEYS.CTRL_L:
+            this.enterGoToLineMode();
             return false;
         case KEYS.CTRL_G:
             this.findNext();
             return false;
+        // ***** SỬA LỖI VISUAL *****
+        // Sau khi undo/redo, chúng ta PHẢI tính toán lại visual rows
         case KEYS.CTRL_Z:
             this.undo();
-            return true;
+            this.recalculateVisualRows(); // <-- THÊM DÒNG NÀY
+            return false;
         case KEYS.CTRL_Y:
             this.redo();
-            return true;
+            this.recalculateVisualRows(); // <-- THÊM DÒNG NÀY
+            return false;
         // --- Clipboard ---
         case KEYS.CTRL_K: // Cut Line (Traditional)
             this.cutLine();
@@ -208,12 +220,17 @@ function handleEditKeys(key) {
             this.pasteLine();
             return true;
         case KEYS.CTRL_X: // Cut Selection
-            this.cutSelection(); // Synchronous wrapper for cutSelectionAsync
+            this.cutSelection();
             return true;
         case KEYS.CTRL_V: // Paste Selection
             this.pasteSelection();
             return true;
+        // Xử lý Ký tự in được
         default:
+            if (key.length === 1 && key >= ' ' && key <= '~') {
+                this.handleCharacterKey(key);
+                return true;
+            }
             return false;
     }
 }
@@ -274,28 +291,130 @@ async function handleSave() {
     }
 }
 /**
- * Handles Search Mode input keys.
+ * Handles Search Mode input keys (for 'search_find' and 'search_replace').
  */
 function handleSearchKeys(key) {
+    const cancelSearch = () => {
+        this.mode = 'edit';
+        this.searchQuery = '';
+        this.replaceQuery = null;
+        this.searchResults = [];
+        this.searchResultIndex = -1;
+        this.setStatusMessage('Cancelled');
+    };
     switch (key) {
         case KEYS.ENTER:
-            this.executeSearch();
-            this.mode = 'edit';
+            if (this.mode === 'search_find') {
+                if (this.replaceQuery === null) {
+                    // Find-Only Flow: Execute search and find first
+                    this.executeSearch();
+                    this.mode = 'edit';
+                    this.findNext();
+                }
+                else {
+                    // Replace Flow: Transition to get replace string
+                    this.mode = 'search_replace';
+                    this.setStatusMessage('Replace with: ');
+                }
+            }
+            else if (this.mode === 'search_replace') {
+                // Replace Flow: We have both strings, execute and find first
+                this.executeSearch();
+                this.mode = 'edit';
+                this.findNext();
+            }
+            break;
+        case KEYS.ESCAPE:
+        case KEYS.CTRL_C:
+        case KEYS.CTRL_Q:
+            cancelSearch();
+            break;
+        case KEYS.BACKSPACE:
+            if (this.mode === 'search_find') {
+                this.searchQuery = this.searchQuery.slice(0, -1);
+            }
+            else {
+                this.replaceQuery = this.replaceQuery.slice(0, -1);
+            }
+            break;
+        default:
+            if (key.length === 1 && key >= ' ' && key <= '~') {
+                if (this.mode === 'search_find') {
+                    this.searchQuery += key;
+                }
+                else {
+                    this.replaceQuery += key;
+                }
+            }
+    }
+    // Update status bar message live (if not cancelling)
+    if (this.mode === 'search_find') {
+        this.setStatusMessage((this.replaceQuery === null ? 'Find: ' : 'Find: ') + this.searchQuery);
+    }
+    else if (this.mode === 'search_replace') {
+        this.setStatusMessage('Replace with: ' + this.replaceQuery);
+    }
+}
+/**
+ * Handles keypresses during the (y/n/a/q) confirmation step.
+ */
+function handleSearchConfirmKeys(key) {
+    switch (key.toLowerCase()) {
+        case 'y': // Yes
+            this.replaceCurrentAndFindNext();
+            break;
+        case 'n': // No
             this.findNext();
             break;
+        case 'a': // All
+            this.replaceAll();
+            break;
+        case 'q': // Quit
         case KEYS.ESCAPE:
         case KEYS.CTRL_C:
         case KEYS.CTRL_Q:
             this.mode = 'edit';
-            this.searchQuery = '';
-            this.setStatusMessage('Search cancelled');
+            this.searchResults = [];
+            this.searchResultIndex = -1;
+            this.setStatusMessage('Replace cancelled');
+            break;
+    }
+}
+/**
+ * Handles keypresses during the 'Go to Line' prompt.
+ */
+function handleGoToLineKeys(key) {
+    const cancel = () => {
+        this.mode = 'edit';
+        this.goToLineQuery = '';
+        this.setStatusMessage('Cancelled');
+    };
+    switch (key) {
+        case KEYS.ENTER:
+            const lineNumber = parseInt(this.goToLineQuery, 10);
+            if (!isNaN(lineNumber) && lineNumber > 0) {
+                this.jumpToLine(lineNumber);
+            }
+            else {
+                this.mode = 'edit';
+                this.setStatusMessage('Invalid line number');
+            }
+            this.goToLineQuery = '';
+            break;
+        case KEYS.ESCAPE:
+        case KEYS.CTRL_C:
+        case KEYS.CTRL_Q:
+            cancel();
             break;
         case KEYS.BACKSPACE:
-            this.searchQuery = this.searchQuery.slice(0, -1);
+            this.goToLineQuery = this.goToLineQuery.slice(0, -1);
+            this.setStatusMessage('Go to Line: ' + this.goToLineQuery);
             break;
         default:
-            if (key.length === 1 && key >= ' ' && key <= '~') {
-                this.searchQuery += key;
+            // Only accept digits
+            if (key.length === 1 && key >= '0' && key <= '9') {
+                this.goToLineQuery += key;
+                this.setStatusMessage('Go to Line: ' + this.goToLineQuery);
             }
     }
 }
@@ -303,6 +422,8 @@ export const keyHandlingMethods = {
     handleKeypressEvent,
     handleEditKeys,
     handleSearchKeys,
+    handleSearchConfirmKeys,
+    handleGoToLineKeys,
     handleCtrlQ,
     handleCopy,
     handleCharacterKey,

package/dist/editor.navigation.d.ts

@@ -30,6 +30,14 @@ declare function adjustCursorPosition(this: CliEditor): void;
  * Scrolls the viewport to keep the cursor visible.
  */
 declare function scroll(this: CliEditor): void;
+/**
+ * Jumps the cursor to a specific line number (1-based).
+ */
+declare function jumpToLine(this: CliEditor, lineNumber: number): void;
+/**
+ * Enters Go To Line mode.
+ */
+declare function enterGoToLineMode(this: CliEditor): void;
 export declare const navigationMethods: {
     findCurrentVisualRowIndex: typeof findCurrentVisualRowIndex;
     moveCursorLogically: typeof moveCursorLogically;
@@ -38,5 +46,7 @@ export declare const navigationMethods: {
     findVisualRowEnd: typeof findVisualRowEnd;
     adjustCursorPosition: typeof adjustCursorPosition;
     scroll: typeof scroll;
+    jumpToLine: typeof jumpToLine;
+    enterGoToLineMode: typeof enterGoToLineMode;
 };
 export {};

package/dist/editor.navigation.js

@@ -121,6 +121,28 @@ function scroll() {
         this.rowOffset = currentVisualRow - this.screenRows + 1;
     }
 }
+/**
+ * Jumps the cursor to a specific line number (1-based).
+ */
+function jumpToLine(lineNumber) {
+    const targetY = lineNumber - 1; // Convert 1-based to 0-based index
+    // Clamp targetY to valid range
+    this.cursorY = Math.max(0, Math.min(targetY, this.lines.length - 1));
+    this.cursorX = 0; // Move to start of line
+    // Adjust scroll
+    const visualRowIndex = this.findCurrentVisualRowIndex();
+    this.rowOffset = Math.max(0, visualRowIndex - Math.floor(this.screenRows / 2));
+    this.mode = 'edit';
+    this.setStatusMessage(`Jumped to line ${lineNumber}`, 1000);
+}
+/**
+ * Enters Go To Line mode.
+ */
+function enterGoToLineMode() {
+    this.mode = 'goto_line';
+    this.goToLineQuery = '';
+    this.setStatusMessage('Go to Line (ESC to cancel): ');
+}
 export const navigationMethods = {
     findCurrentVisualRowIndex,
     moveCursorLogically,
@@ -129,4 +151,6 @@ export const navigationMethods = {
     findVisualRowEnd,
     adjustCursorPosition,
     scroll,
+    jumpToLine,
+    enterGoToLineMode,
 };

package/dist/editor.rendering.js

@@ -65,6 +65,11 @@ function render() {
                 const logicalY = row.logicalY;
                 const isCursorPosition = (visualRowIndex === currentVisualRowIndex && i === cursorVisualX);
                 const isSelected = selectionRange && this.isPositionInSelection(logicalY, logicalX, selectionRange);
+                // Highlight search result under cursor
+                const isSearchResult = (this.searchResultIndex !== -1 &&
+                    this.searchResults[this.searchResultIndex]?.y === logicalY &&
+                    logicalX >= this.searchResults[this.searchResultIndex]?.x &&
+                    logicalX < (this.searchResults[this.searchResultIndex]?.x + this.searchQuery.length));
                 if (isSelected) {
                     buffer += ANSI.INVERT_COLORS + char + ANSI.RESET_COLORS;
                 }
@@ -72,6 +77,10 @@ function render() {
                     // Cursor is a single inverted character if not already covered by selection
                     buffer += ANSI.INVERT_COLORS + char + ANSI.RESET_COLORS;
                 }
+                else if (isSearchResult) {
+                    // Highlight search result
+                    buffer += ANSI.INVERT_COLORS + char + ANSI.RESET_COLORS;
+                }
                 else {
                     buffer += char;
                 }
@@ -123,24 +132,38 @@ function renderStatusBar() {
     let status = '';
     const contentWidth = this.screenCols;
     // --- Line 1: Mode, File Status, Position ---
-    if (this.mode === 'search') {
-        status = `SEARCH: ${this.searchQuery}`;
-    }
-    else {
-        const visualRowIndex = this.findCurrentVisualRowIndex();
-        const visualRow = this.visualRows[visualRowIndex];
-        const visualX = visualRow ? (this.cursorX - visualRow.logicalXStart) : 0;
-        const fileStatus = this.isDirty ? `* ${this.filepath}` : this.filepath;
-        const pos = `Ln ${this.cursorY + 1}, Col ${this.cursorX + 1} (View: ${visualRowIndex + 1},${visualX + 1})`;
-        const statusLeft = `[${fileStatus}]`.padEnd(Math.floor(contentWidth * 0.5));
-        const statusRight = pos.padStart(Math.floor(contentWidth * 0.5));
-        status = statusLeft + statusRight;
+    switch (this.mode) {
+        case 'search_find':
+            status = (this.replaceQuery === null ? 'Find: ' : 'Find: ') + this.searchQuery;
+            break;
+        case 'search_replace':
+            status = 'Replace with: ' + this.replaceQuery;
+            break;
+        case 'goto_line':
+            status = 'Go to Line: ' + this.goToLineQuery;
+            break;
+        case 'search_confirm':
+            // The (y/n/a/q) prompt is set via setStatusMessage
+            status = this.statusMessage;
+            break;
+        case 'edit':
+        default:
+            const visualRowIndex = this.findCurrentVisualRowIndex();
+            const visualRow = this.visualRows[visualRowIndex];
+            const visualX = visualRow ? (this.cursorX - visualRow.logicalXStart) : 0;
+            const fileStatus = this.isDirty ? `* ${this.filepath}` : this.filepath;
+            const pos = `Ln ${this.cursorY + 1}, Col ${this.cursorX + 1} (View: ${visualRowIndex + 1},${visualX + 1})`;
+            const statusLeft = `[${fileStatus}]`.padEnd(Math.floor(contentWidth * 0.5));
+            const statusRight = pos.padStart(Math.floor(contentWidth * 0.5));
+            status = statusLeft + statusRight;
+            break;
     }
     status = status.padEnd(contentWidth);
     let buffer = `${ANSI.INVERT_COLORS}${status}${ANSI.RESET_COLORS}`;
     // --- Line 2: Message/Help line ---
     buffer += `\x1b[${this.screenRows + this.screenStartRow + 1};1H`;
-    const message = this.statusMessage.padEnd(contentWidth);
+    // Show prompt message if in search mode, otherwise show default help
+    const message = (this.mode === 'edit' ? this.DEFAULT_STATUS : this.statusMessage).padEnd(contentWidth);
     buffer += `${message}${ANSI.CLEAR_LINE}`;
     return buffer;
 }

package/dist/editor.search.d.ts

@@ -1,11 +1,15 @@
 import { CliEditor } from './editor.js';
 /**
- * Methods related to Find/Search functionality.
+ * Methods related to Find/Search/Replace functionality.
  */
 /**
- * Enters search mode.
+ * Enters Find mode.
  */
-declare function enterSearchMode(this: CliEditor): void;
+declare function enterFindMode(this: CliEditor): void;
+/**
+ * Enters Replace mode (starting with the "Find" prompt).
+ */
+declare function enterReplaceMode(this: CliEditor): void;
 /**
  * Executes the search and populates results.
  */
@@ -14,6 +18,14 @@ declare function executeSearch(this: CliEditor): void;
  * Jumps to the next search result.
  */
 declare function findNext(this: CliEditor): void;
+/**
+ * Replaces the current highlighted search result and finds the next one.
+ */
+declare function replaceCurrentAndFindNext(this: CliEditor): void;
+/**
+ * Replaces all occurrences of the search query.
+ */
+declare function replaceAll(this: CliEditor): void;
 /**
  * Moves cursor and adjusts scroll offset to make the result visible.
  */
@@ -22,9 +34,12 @@ declare function jumpToResult(this: CliEditor, result: {
     x: number;
 }): void;
 export declare const searchMethods: {
-    enterSearchMode: typeof enterSearchMode;
+    enterFindMode: typeof enterFindMode;
+    enterReplaceMode: typeof enterReplaceMode;
     executeSearch: typeof executeSearch;
     findNext: typeof findNext;
+    replaceCurrentAndFindNext: typeof replaceCurrentAndFindNext;
+    replaceAll: typeof replaceAll;
     jumpToResult: typeof jumpToResult;
 };
 export {};