Simplified fix - minimal changes (Sun Nov 2 10:24:18 PST 2025)

Author: aaronik

lua/treewalker/movement.lua

@@ -26,6 +26,18 @@ end
 
 ---@return nil
 function M.move_out()
+  -- Move cursor to first non-whitespace character of current line (like normal! ^)
+  local current_row = vim.fn.line('.')
+  local current_col = vim.fn.col('.')
+  local current_line = require('treewalker.lines').get_line(current_row)
+  if current_line then
+    local start_col = require('treewalker.lines').get_start_col(current_line)
+    -- Only move if we're not already at the first non-whitespace character
+    if current_col ~= start_col then
+      vim.api.nvim_win_set_cursor(0, { current_row, start_col - 1 }) -- Convert to 0-indexed
+    end
+  end
+
   local node = nodes.get_current()
   local target, row = targets.out(node)
   if not (target and row) then