vim-sim 1.0.2 → 1.0.3

package/dist/index.js

@@ -1547,9 +1547,342 @@ var CompletionManager = class _CompletionManager {
   }
 };
 
+// src/core/config-manager.ts
+var ConfigManager = class _ConfigManager {
+  config;
+  listeners = /* @__PURE__ */ new Map();
+  constructor(initialConfig) {
+    this.config = {
+      // Display
+      number: false,
+      relativenumber: false,
+      wrap: true,
+      cursorline: false,
+      // Indentation
+      tabstop: 4,
+      shiftwidth: 2,
+      expandtab: true,
+      autoindent: true,
+      smartindent: false,
+      // Search
+      ignorecase: false,
+      smartcase: false,
+      hlsearch: true,
+      incsearch: true,
+      wrapscan: true,
+      // Motion behavior
+      whichwrap: "h,l",
+      // vim-sim default: h,l wrap (Vim default: "b,s")
+      startofline: true,
+      // Vim default: true
+      virtualedit: "",
+      // Vim default: ""
+      // Editing
+      undolevels: 1e3,
+      clipboard: "",
+      ...initialConfig
+    };
+  }
+  /**
+   * Get a config value
+   */
+  get(key) {
+    return this.config[key];
+  }
+  /**
+   * Set a config value
+   */
+  set(key, value) {
+    const oldValue = this.config[key];
+    if (oldValue === value) return;
+    this.config[key] = value;
+    this.notifyListeners(key, value);
+  }
+  /**
+   * Set multiple config values at once
+   */
+  setMultiple(updates) {
+    for (const [key, value] of Object.entries(updates)) {
+      this.set(key, value);
+    }
+  }
+  /**
+   * Get all config values
+   */
+  getAll() {
+    return { ...this.config };
+  }
+  /**
+   * Reset to default configuration
+   */
+  reset() {
+    const defaults = new _ConfigManager().getAll();
+    this.setMultiple(defaults);
+  }
+  /**
+   * Toggle a boolean config option
+   */
+  toggle(key) {
+    const value = this.config[key];
+    if (typeof value === "boolean") {
+      this.set(key, !value);
+    }
+  }
+  /**
+   * Subscribe to config changes
+   * @param key - Config key to watch, or '*' for all changes
+   * @param callback - Function to call when config changes
+   * @returns Unsubscribe function
+   */
+  onChange(key, callback) {
+    if (!this.listeners.has(key)) {
+      this.listeners.set(key, /* @__PURE__ */ new Set());
+    }
+    this.listeners.get(key).add(callback);
+    return () => {
+      this.listeners.get(key)?.delete(callback);
+    };
+  }
+  /**
+   * Notify all listeners of a config change
+   */
+  notifyListeners(key, value) {
+    this.listeners.get(key)?.forEach((callback) => callback(key, value));
+    this.listeners.get("*")?.forEach((callback) => callback(key, value));
+  }
+  /**
+   * Parse a Vim set command string (e.g., "number", "nonumber", "tabstop=4")
+   */
+  parseSetCommand(command) {
+    const noMatch = command.match(/^no(\w+)$/);
+    if (noMatch) {
+      const key2 = noMatch[1];
+      if (key2 in this.config && typeof this.config[key2] === "boolean") {
+        this.set(key2, false);
+        return true;
+      }
+      return false;
+    }
+    const valueMatch = command.match(/^(\w+)=(.+)$/);
+    if (valueMatch) {
+      const key2 = valueMatch[1];
+      const value = valueMatch[2];
+      if (!(key2 in this.config)) return false;
+      const currentValue = this.config[key2];
+      if (typeof currentValue === "number") {
+        const numValue = parseInt(value, 10);
+        if (!isNaN(numValue)) {
+          this.set(key2, numValue);
+          return true;
+        }
+      } else if (typeof currentValue === "string") {
+        this.set(key2, value);
+        return true;
+      }
+      return false;
+    }
+    const key = command;
+    if (key in this.config && typeof this.config[key] === "boolean") {
+      this.set(key, true);
+      return true;
+    }
+    return false;
+  }
+  /**
+   * Get a formatted string representation of a config value
+   */
+  formatValue(key) {
+    const value = this.config[key];
+    if (typeof value === "boolean") {
+      return value ? key : `no${key}`;
+    }
+    return `${key}=${value}`;
+  }
+  /**
+   * Get metadata about a config option
+   */
+  getMetadata(key) {
+    return CONFIG_METADATA[key];
+  }
+  /**
+   * Get all options that differ from vanilla Vim
+   */
+  getDifferencesFromVim() {
+    return Object.entries(CONFIG_METADATA).filter(([_, meta]) => meta.differsFromVim).map(([key, _]) => key);
+  }
+  /**
+   * Get options by category
+   */
+  getByCategory(category) {
+    return Object.entries(CONFIG_METADATA).filter(([_, meta]) => meta.category === category).map(([key, _]) => key);
+  }
+};
+var CONFIG_METADATA = {
+  // Display options
+  number: {
+    description: "Show line numbers in the left margin",
+    vimDefault: false,
+    vimSimDefault: false,
+    category: "display",
+    type: "boolean",
+    differsFromVim: false
+  },
+  relativenumber: {
+    description: "Show line numbers relative to cursor position",
+    vimDefault: false,
+    vimSimDefault: false,
+    category: "display",
+    type: "boolean",
+    differsFromVim: false
+  },
+  wrap: {
+    description: "Wrap long lines to fit in window",
+    vimDefault: true,
+    vimSimDefault: true,
+    category: "display",
+    type: "boolean",
+    differsFromVim: false
+  },
+  cursorline: {
+    description: "Highlight the screen line of the cursor",
+    vimDefault: false,
+    vimSimDefault: false,
+    category: "display",
+    type: "boolean",
+    differsFromVim: false
+  },
+  // Indentation options
+  tabstop: {
+    description: "Number of spaces that a <Tab> in the file counts for",
+    vimDefault: 8,
+    vimSimDefault: 4,
+    category: "indentation",
+    type: "number",
+    differsFromVim: true
+  },
+  shiftwidth: {
+    description: "Number of spaces to use for each step of (auto)indent",
+    vimDefault: 8,
+    vimSimDefault: 2,
+    category: "indentation",
+    type: "number",
+    differsFromVim: true
+  },
+  expandtab: {
+    description: "Use spaces instead of tabs when pressing <Tab>",
+    vimDefault: false,
+    vimSimDefault: true,
+    category: "indentation",
+    type: "boolean",
+    differsFromVim: true
+  },
+  autoindent: {
+    description: "Copy indent from current line when starting a new line",
+    vimDefault: false,
+    vimSimDefault: true,
+    category: "indentation",
+    type: "boolean",
+    differsFromVim: true
+  },
+  smartindent: {
+    description: "Do smart autoindenting when starting a new line",
+    vimDefault: false,
+    vimSimDefault: false,
+    category: "indentation",
+    type: "boolean",
+    differsFromVim: false
+  },
+  // Search options
+  ignorecase: {
+    description: "Ignore case in search patterns",
+    vimDefault: false,
+    vimSimDefault: false,
+    category: "search",
+    type: "boolean",
+    differsFromVim: false
+  },
+  smartcase: {
+    description: "Override ignorecase if search pattern contains uppercase",
+    vimDefault: false,
+    vimSimDefault: false,
+    category: "search",
+    type: "boolean",
+    differsFromVim: false
+  },
+  hlsearch: {
+    description: "Highlight all matches for the search pattern",
+    vimDefault: false,
+    vimSimDefault: true,
+    category: "search",
+    type: "boolean",
+    differsFromVim: true
+  },
+  incsearch: {
+    description: "Show match for partly typed search pattern",
+    vimDefault: false,
+    vimSimDefault: true,
+    category: "search",
+    type: "boolean",
+    differsFromVim: true
+  },
+  wrapscan: {
+    description: "Searches wrap around the end of the file",
+    vimDefault: true,
+    vimSimDefault: true,
+    category: "search",
+    type: "boolean",
+    differsFromVim: false
+  },
+  // Motion behavior options
+  whichwrap: {
+    description: "Keys that wrap to prev/next line (b=<BS>, s=<Space>, h=h, l=l, <=<Left>, >=<Right>, [=<Left> in insert, ]=<Right> in insert)",
+    vimDefault: "b,s",
+    vimSimDefault: "h,l",
+    category: "motion",
+    type: "string",
+    differsFromVim: true,
+    validValues: ["b", "s", "h", "l", "<", ">", "[", "]", "~"]
+  },
+  startofline: {
+    description: "Move cursor to first non-blank when changing lines with G, gg, d, etc.",
+    vimDefault: true,
+    vimSimDefault: true,
+    category: "motion",
+    type: "boolean",
+    differsFromVim: false
+  },
+  virtualedit: {
+    description: "Allow cursor positioning where there is no character (block, insert, all, onemore)",
+    vimDefault: "",
+    vimSimDefault: "",
+    category: "motion",
+    type: "string",
+    differsFromVim: false,
+    validValues: ["block", "insert", "all", "onemore", ""]
+  },
+  // Editing options
+  undolevels: {
+    description: "Maximum number of changes that can be undone",
+    vimDefault: 1e3,
+    vimSimDefault: 1e3,
+    category: "editing",
+    type: "number",
+    differsFromVim: false
+  },
+  clipboard: {
+    description: "Use system clipboard for unnamed register",
+    vimDefault: "",
+    vimSimDefault: "",
+    category: "editing",
+    type: "string",
+    differsFromVim: false,
+    validValues: ["unnamed", "unnamedplus", ""]
+  }
+};
+
 // src/core/state.ts
 var State = class {
-  constructor(buffer, cursor, selection, mode, commandLine = "", desiredColumn = null, viewport = new VimViewport(), visualAnchor = null, lastVisualSelection = null, recordingRegister = null, lastMacroRegister = null, foldManager = new FoldManager(), markManager = new MarkManager(), jumpListManager = new JumpListManager(), fileSystem = new FileSystemManager(), windowManager = new WindowManager(), lastSearch = null, spellChecker = new SpellChecker(), completionManager = new CompletionManager(), undoTree = null, lastCommand = null) {
+  constructor(buffer, cursor, selection, mode, commandLine = "", desiredColumn = null, viewport = new VimViewport(), visualAnchor = null, lastVisualSelection = null, recordingRegister = null, lastMacroRegister = null, foldManager = new FoldManager(), markManager = new MarkManager(), jumpListManager = new JumpListManager(), fileSystem = new FileSystemManager(), windowManager = new WindowManager(), lastSearch = null, spellChecker = new SpellChecker(), completionManager = new CompletionManager(), undoTree = null, lastCommand = null, configManager = null) {
     this.buffer = buffer;
     this.cursor = cursor;
     this.selection = selection;
@@ -1571,6 +1904,7 @@ var State = class {
     this.completionManager = completionManager;
     this.undoTree = undoTree;
     this.lastCommand = lastCommand;
+    this.configManager = configManager;
   }
 };
 function createEmptyState() {
@@ -1596,8 +1930,10 @@ function createEmptyState() {
     new CompletionManager(),
     null,
     // undoTree will be initialized separately
-    null
+    null,
     // lastCommand
+    new ConfigManager()
+    // configManager with default settings
   );
   return state;
 }
@@ -2139,7 +2475,17 @@ function withBufferContent(state, content) {
     state.visualAnchor,
     state.lastVisualSelection,
     state.recordingRegister,
-    state.lastMacroRegister
+    state.lastMacroRegister,
+    state.foldManager,
+    state.markManager,
+    state.jumpListManager,
+    state.fileSystem,
+    state.windowManager,
+    state.lastSearch,
+    state.spellChecker,
+    state.completionManager,
+    state.undoTree,
+    state.lastCommand
   );
 }
 function withCursor(state, cursor, preserveDesiredColumn = true) {
@@ -2154,7 +2500,17 @@ function withCursor(state, cursor, preserveDesiredColumn = true) {
     state.visualAnchor,
     state.lastVisualSelection,
     state.recordingRegister,
-    state.lastMacroRegister
+    state.lastMacroRegister,
+    state.foldManager,
+    state.markManager,
+    state.jumpListManager,
+    state.fileSystem,
+    state.windowManager,
+    state.lastSearch,
+    state.spellChecker,
+    state.completionManager,
+    state.undoTree,
+    state.lastCommand
   );
 }
 function withCursorVertical(state, cursor, targetColumn) {
@@ -2166,11 +2522,22 @@ function withCursorVertical(state, cursor, targetColumn) {
     state.mode,
     state.commandLine,
     desiredCol,
+    // Maintain desiredColumn for vertical movements
     state.viewport,
     state.visualAnchor,
     state.lastVisualSelection,
     state.recordingRegister,
-    state.lastMacroRegister
+    state.lastMacroRegister,
+    state.foldManager,
+    state.markManager,
+    state.jumpListManager,
+    state.fileSystem,
+    state.windowManager,
+    state.lastSearch,
+    state.spellChecker,
+    state.completionManager,
+    state.undoTree,
+    state.lastCommand
   );
 }
 function withCursorHorizontal(state, cursor) {
@@ -2181,11 +2548,22 @@ function withCursorHorizontal(state, cursor) {
     state.mode,
     state.commandLine,
     null,
+    // Reset desiredColumn for horizontal movements
     state.viewport,
     state.visualAnchor,
     state.lastVisualSelection,
     state.recordingRegister,
-    state.lastMacroRegister
+    state.lastMacroRegister,
+    state.foldManager,
+    state.markManager,
+    state.jumpListManager,
+    state.fileSystem,
+    state.windowManager,
+    state.lastSearch,
+    state.spellChecker,
+    state.completionManager,
+    state.undoTree,
+    state.lastCommand
   );
 }
 function withViewport(state, topLine) {
@@ -2471,18 +2849,24 @@ var B = class extends Motion {
 };
 
 // src/motions/basic.ts
+function canWrap(state, key) {
+  const whichwrap = state.configManager?.get("whichwrap") ?? "h,l";
+  const allowed = whichwrap.split(",").map((s) => s.trim());
+  return allowed.includes(key);
+}
 var h = class extends Motion {
   key = "h";
   execute(state, context) {
     let count = getCount(context);
     let line = state.cursor.line;
     let col = state.cursor.column;
+    const allowWrap = canWrap(state, "h");
     while (count > 0) {
       if (col > 0) {
         const moveAmount = Math.min(col, count);
         col -= moveAmount;
         count -= moveAmount;
-      } else if (line > 0) {
+      } else if (line > 0 && allowWrap) {
         line--;
         const prevLine = getLine(state.buffer, line);
         col = Math.max(0, prevLine.length - 1);
@@ -2494,11 +2878,53 @@ var h = class extends Motion {
     return withCursorHorizontal(state, new Cursor(line, col));
   }
 };
-var Backspace = class extends h {
+var Backspace = class extends Motion {
   key = "Backspace";
+  execute(state, context) {
+    let count = getCount(context);
+    let line = state.cursor.line;
+    let col = state.cursor.column;
+    const allowWrap = canWrap(state, "b");
+    while (count > 0) {
+      if (col > 0) {
+        const moveAmount = Math.min(col, count);
+        col -= moveAmount;
+        count -= moveAmount;
+      } else if (line > 0 && allowWrap) {
+        line--;
+        const prevLine = getLine(state.buffer, line);
+        col = Math.max(0, prevLine.length - 1);
+        count--;
+      } else {
+        break;
+      }
+    }
+    return withCursorHorizontal(state, new Cursor(line, col));
+  }
 };
-var ArrowLeft = class extends h {
+var ArrowLeft = class extends Motion {
   key = "ArrowLeft";
+  execute(state, context) {
+    let count = getCount(context);
+    let line = state.cursor.line;
+    let col = state.cursor.column;
+    const allowWrap = canWrap(state, "<");
+    while (count > 0) {
+      if (col > 0) {
+        const moveAmount = Math.min(col, count);
+        col -= moveAmount;
+        count -= moveAmount;
+      } else if (line > 0 && allowWrap) {
+        line--;
+        const prevLine = getLine(state.buffer, line);
+        col = Math.max(0, prevLine.length - 1);
+        count--;
+      } else {
+        break;
+      }
+    }
+    return withCursorHorizontal(state, new Cursor(line, col));
+  }
 };
 var l = class extends Motion {
   key = "l";
@@ -2506,7 +2932,7 @@ var l = class extends Motion {
     let count = getCount(context);
     let line = state.cursor.line;
     let col = state.cursor.column;
-    const totalLines = lastLine(state) + 1;
+    const allowWrap = canWrap(state, "l");
     while (count > 0) {
       const currentLine2 = getLine(state.buffer, line);
       const maxCol = Math.max(0, currentLine2.length - 1);
@@ -2514,7 +2940,7 @@ var l = class extends Motion {
         const moveAmount = Math.min(maxCol - col, count);
         col += moveAmount;
         count -= moveAmount;
-      } else if (line < lastLine(state)) {
+      } else if (line < lastLine(state) && allowWrap) {
         line++;
         col = 0;
         count--;
@@ -2525,8 +2951,30 @@ var l = class extends Motion {
     return withCursorHorizontal(state, new Cursor(line, col));
   }
 };
-var ArrowRight = class extends l {
+var ArrowRight = class extends Motion {
   key = "ArrowRight";
+  execute(state, context) {
+    let count = getCount(context);
+    let line = state.cursor.line;
+    let col = state.cursor.column;
+    const allowWrap = canWrap(state, ">");
+    while (count > 0) {
+      const currentLine2 = getLine(state.buffer, line);
+      const maxCol = Math.max(0, currentLine2.length - 1);
+      if (col < maxCol) {
+        const moveAmount = Math.min(maxCol - col, count);
+        col += moveAmount;
+        count -= moveAmount;
+      } else if (line < lastLine(state) && allowWrap) {
+        line++;
+        col = 0;
+        count--;
+      } else {
+        break;
+      }
+    }
+    return withCursorHorizontal(state, new Cursor(line, col));
+  }
 };
 var j = class extends Motion {
   key = "j";
@@ -2838,151 +3286,6 @@ var IndentationManager = class {
   }
 };
 
-// src/core/config-manager.ts
-var ConfigManager = class _ConfigManager {
-  config;
-  listeners = /* @__PURE__ */ new Map();
-  constructor(initialConfig) {
-    this.config = {
-      // Display
-      number: false,
-      relativenumber: false,
-      wrap: true,
-      cursorline: false,
-      // Indentation
-      tabstop: 4,
-      shiftwidth: 2,
-      expandtab: true,
-      autoindent: true,
-      smartindent: false,
-      // Search
-      ignorecase: false,
-      smartcase: false,
-      hlsearch: true,
-      incsearch: true,
-      // Editing
-      undolevels: 1e3,
-      clipboard: "",
-      ...initialConfig
-    };
-  }
-  /**
-   * Get a config value
-   */
-  get(key) {
-    return this.config[key];
-  }
-  /**
-   * Set a config value
-   */
-  set(key, value) {
-    const oldValue = this.config[key];
-    if (oldValue === value) return;
-    this.config[key] = value;
-    this.notifyListeners(key, value);
-  }
-  /**
-   * Set multiple config values at once
-   */
-  setMultiple(updates) {
-    for (const [key, value] of Object.entries(updates)) {
-      this.set(key, value);
-    }
-  }
-  /**
-   * Get all config values
-   */
-  getAll() {
-    return { ...this.config };
-  }
-  /**
-   * Reset to default configuration
-   */
-  reset() {
-    const defaults = new _ConfigManager().getAll();
-    this.setMultiple(defaults);
-  }
-  /**
-   * Toggle a boolean config option
-   */
-  toggle(key) {
-    const value = this.config[key];
-    if (typeof value === "boolean") {
-      this.set(key, !value);
-    }
-  }
-  /**
-   * Subscribe to config changes
-   * @param key - Config key to watch, or '*' for all changes
-   * @param callback - Function to call when config changes
-   * @returns Unsubscribe function
-   */
-  onChange(key, callback) {
-    if (!this.listeners.has(key)) {
-      this.listeners.set(key, /* @__PURE__ */ new Set());
-    }
-    this.listeners.get(key).add(callback);
-    return () => {
-      this.listeners.get(key)?.delete(callback);
-    };
-  }
-  /**
-   * Notify all listeners of a config change
-   */
-  notifyListeners(key, value) {
-    this.listeners.get(key)?.forEach((callback) => callback(key, value));
-    this.listeners.get("*")?.forEach((callback) => callback(key, value));
-  }
-  /**
-   * Parse a Vim set command string (e.g., "number", "nonumber", "tabstop=4")
-   */
-  parseSetCommand(command) {
-    const noMatch = command.match(/^no(\w+)$/);
-    if (noMatch) {
-      const key2 = noMatch[1];
-      if (key2 in this.config && typeof this.config[key2] === "boolean") {
-        this.set(key2, false);
-        return true;
-      }
-      return false;
-    }
-    const valueMatch = command.match(/^(\w+)=(.+)$/);
-    if (valueMatch) {
-      const key2 = valueMatch[1];
-      const value = valueMatch[2];
-      if (!(key2 in this.config)) return false;
-      const currentValue = this.config[key2];
-      if (typeof currentValue === "number") {
-        const numValue = parseInt(value, 10);
-        if (!isNaN(numValue)) {
-          this.set(key2, numValue);
-          return true;
-        }
-      } else if (typeof currentValue === "string") {
-        this.set(key2, value);
-        return true;
-      }
-      return false;
-    }
-    const key = command;
-    if (key in this.config && typeof this.config[key] === "boolean") {
-      this.set(key, true);
-      return true;
-    }
-    return false;
-  }
-  /**
-   * Get a formatted string representation of a config value
-   */
-  formatValue(key) {
-    const value = this.config[key];
-    if (typeof value === "boolean") {
-      return value ? key : `no${key}`;
-    }
-    return `${key}=${value}`;
-  }
-};
-
 // src/core/mode-transition.ts
 var ModeTransition = class extends Command {
   // Optional hook to modify state before mode transition
@@ -3841,7 +4144,7 @@ var gE = class extends Motion {
     return repeatCursorMotion(state, context, findPrevWORDEnd);
   }
 };
-var LastNonBlank = class extends Motion {
+var g_ = class extends Motion {
   key = "g_";
   inclusive = true;
   // g_ is inclusive
@@ -3855,7 +4158,7 @@ var LastNonBlank = class extends Motion {
     return withCursorHorizontal(state, new Cursor(state.cursor.line, col));
   }
 };
-var MiddleOfScreenLine = class extends Motion {
+var gm = class extends Motion {
   key = "gm";
   execute(state) {
     const line = getLine(state.buffer, state.cursor.line);
@@ -6234,18 +6537,11 @@ var Session = class _Session {
     }
     this.keyBuffer.push(key);
     const input = this.keyBuffer.join("");
-    console.log("[DEBUG] handleKey - input:", input, "keyBuffer:", this.keyBuffer);
     const result = this.match(input, this.keyBuffer);
-    console.log("[DEBUG] handleKey - match result:", result ? result === "partial" ? "partial" : `complete: ${result.command.key}` : "null");
     if (result && result !== "partial" && result.isComplete) {
       const stateBefore = this.state;
       result.context.registerManager = this.registerManager;
       result.context.indentationManager = this.indentationManager;
-      console.log("[DEBUG] Executing command:", result.command.key, "with context:", {
-        count: result.context.count,
-        motion: result.context.motion?.key,
-        char: result.context.char
-      });
       this.state = result.command.execute(this.state, result.context);
       if ((stateBefore.mode === 2 /* VISUAL */ || stateBefore.mode === 3 /* VISUAL_LINE */ || stateBefore.mode === 4 /* VISUAL_BLOCK */) && this.state.mode === stateBefore.mode && // Still in same visual mode
       stateBefore.visualAnchor && (this.state.cursor.line !== stateBefore.cursor.line || this.state.cursor.column !== stateBefore.cursor.column)) {
@@ -6648,8 +6944,8 @@ var Session = class _Session {
     addMotionAllModes(new MatchPercent());
     addMotionAllModes(new ge());
     addMotionAllModes(new gE());
-    addMotionAllModes(new LastNonBlank());
-    addMotionAllModes(new MiddleOfScreenLine());
+    addMotionAllModes(new g_());
+    addMotionAllModes(new gm());
     addMotionAllModes(new MiddleOfLine());
     addMotionAllModes(new Column());
     addMotionAllModes(new Star());
@@ -6845,6 +7141,7 @@ var PatternRegistry = class {
 };
 export {
   Buffer,
+  CONFIG_METADATA,
   Change,
   Command,
   ConfigManager,