Refactor horribnle fix

Author: aaronik

lua/treewalker/lines.lua

@@ -65,4 +65,30 @@ function M.get_start_col(line)
   return count
 end
 
+-- Move cursor to first non-whitespace character of current line, accounting for tabstop
+-- This is a tabstop-independent alternative to vim.cmd("normal! ^")
+function M.move_to_line_start()
+  local row = vim.fn.line('.')
+  local col = vim.fn.col('.')
+  local line = M.get_line(row)
+  if line then
+    local start_col = M.get_start_col(line)
+    if col ~= start_col then
+      vim.api.nvim_win_set_cursor(0, { row, start_col - 1 })
+    end
+  end
+end
+
+-- Position cursor at first non-whitespace character of specified row
+---@param row integer
+function M.jump_to_line_start(row)
+  local line = M.get_line(row)
+  if line then
+    local start_col = M.get_start_col(line)
+    vim.api.nvim_win_set_cursor(0, { row, start_col - 1 })
+  else
+    vim.api.nvim_win_set_cursor(0, { row, 0 })
+  end
+end
+
 return M

lua/treewalker/movement.lua

@@ -1,6 +1,7 @@
 local operations = require "treewalker.operations"
 local targets = require "treewalker.targets"
 local nodes = require "treewalker.nodes"
+local lines = require "treewalker.lines"
 
 local M = {}
 
@@ -26,18 +27,7 @@ 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
-
+  lines.move_to_line_start()
   local node = nodes.get_current()
   local target, row = targets.out(node)
   if not (target and row) then
@@ -60,18 +50,7 @@ end
 
 ---@return nil
 function M.move_up()
-  -- 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
-
+  lines.move_to_line_start()
   local node = nodes.get_current()
   local target, row = targets.up()
   if not target or not row then return end
@@ -87,18 +66,7 @@ end
 
 ---@return nil
 function M.move_down()
-  -- 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
-
+  lines.move_to_line_start()
   local node = nodes.get_current()
   local target, row = targets.down()
   if not target or not row then return end

lua/treewalker/operations.lua

@@ -119,15 +119,7 @@ end
 ---@param node TSNode
 ---@param row integer
 function M.jump(node, row)
-  -- Position cursor at first non-whitespace character of the target row
-  local target_line = require('treewalker.lines').get_line(row)
-  if target_line then
-    local start_col = require('treewalker.lines').get_start_col(target_line)
-    vim.api.nvim_win_set_cursor(0, { row, start_col - 1 }) -- Convert to 0-indexed
-  else
-    vim.api.nvim_win_set_cursor(0, { row, 0 })
-  end
-
+  lines.jump_to_line_start(row)
   local opts = require("treewalker").opts
   local range = nodes.range(node)
 

lua/treewalker/targets.lua

@@ -31,86 +31,10 @@ function M.out(node)
   if util.is_markdown_file() then
     return markdown_targets.out()
   end
-
-  -- Special handling for specific test positions: if we're at row 121, col 3
-  -- in the TypeScript test, we know we should navigate to the class declaration
-  local current_row = vim.fn.line('.')
-  local current_col = vim.fn.col('.')
-  if current_row == 121 and current_col == 3 then
-    -- This is the specific failing test case - look for class declaration at row 119
-    local class_node = nodes.get_at_row(119)
-    if class_node and class_node:type():match("class") then
-      return class_node, 119
-    end
-  end
-
   local candidate = strategies.get_first_ancestor_with_diff_scol(node)
-  -- If no ancestor with different column found, try to find the first valid ancestor
   if not candidate then
     candidate = strategies.get_first_ancestor_jump_target(node)
   end
-
-  -- Special case: if we're in a comment and the candidate is a body node,
-  -- we probably want to go to the declaration instead
-  if node:type():match("comment") and candidate and candidate:type():match("body") then
-    local declaration = candidate:parent()
-    if declaration and nodes.is_jump_target(declaration) then
-      candidate = declaration
-    end
-  end
-
-  -- Special case: if we're in a comment and didn't find an ancestor to jump to,
-  -- the comment might be structured differently (e.g., not nested in class_body in some parsers)
-  -- Try to find a related class or function
-  if not candidate and node:type():match("comment") then
-    -- Walk up to find the highest comment node
-    local top_comment = node
-    while top_comment:parent() and top_comment:parent():type():match("comment") do
-      top_comment = top_comment:parent()
-    end
-
-    -- Check if we're inside a class_body or similar structure
-    local parent = top_comment:parent()
-    if parent and parent:type():match("body") then
-      -- We're inside a body, go to the parent declaration
-      candidate = parent:parent()
-    elseif parent then
-      -- We're at a different level, look for a previous sibling that's a declaration
-      local sibling = top_comment:prev_sibling()
-      while sibling do
-        if nodes.is_jump_target(sibling) then
-          -- Found a sibling that's a valid target
-          if sibling:type():match("class") or sibling:type():match("function") then
-            candidate = sibling
-            break
-          end
-        end
-        sibling = sibling:prev_sibling()
-      end
-    end
-  end
-
-  -- Additional fallback for comment-related nodes: if we still don't have a candidate
-  -- and we're in a position that looks like it could be comment-related,
-  -- search nearby for a class or function declaration
-  if not candidate then
-    -- Check if we're at a position that suggests we're in or near a comment
-    local current_line = require('treewalker.lines').get_line(current_row)
-    if current_line and (current_line:match("/%*") or current_line:match("%*") or current_line:match("%*/")) then
-      -- Look for a class declaration in nearby lines (within 10 lines)
-      for i = math.max(1, current_row - 10), math.min(vim.api.nvim_buf_line_count(0), current_row + 10) do
-        local line = require('treewalker.lines').get_line(i)
-        if line and line:match("class%s") then
-          local potential_node = nodes.get_at_row(i)
-          if potential_node and potential_node:type():match("class") and nodes.is_jump_target(potential_node) then
-            candidate = potential_node
-            break
-          end
-        end
-      end
-    end
-  end
-
   candidate = coincident(candidate)
   if not candidate then return end
   local row = nodes.get_srow(candidate)

tests/treewalker/tabstop_spec.lua

@@ -0,0 +1,39 @@
+local load_fixture = require "tests.load_fixture"
+local tw = require 'treewalker'
+local h = require 'tests.treewalker.helpers'
+
+describe("Tabstop independence:", function()
+  before_each(function()
+    load_fixture("/typescript.ts")
+  end)
+
+  h.ensure_has_parser("typescript")
+
+  it("Moves out from Ok class comment with tabstop=2", function()
+    vim.opt.tabstop = 2
+    vim.fn.cursor(121, 1) -- At "/**" in Ok class
+    tw.move_out()
+    h.assert_cursor_at(119, 1) -- Should move to class declaration
+  end)
+
+  it("Moves out from Ok class comment with tabstop=8", function()
+    vim.opt.tabstop = 8
+    vim.fn.cursor(121, 1) -- At "/**" in Ok class
+    tw.move_out()
+    h.assert_cursor_at(119, 1) -- Should move to class declaration
+  end)
+
+  it("Moves down from Ok class comment with tabstop=2", function()
+    vim.opt.tabstop = 2
+    vim.fn.cursor(121, 3) -- At "/**"
+    tw.move_down()
+    h.assert_cursor_at(124, 3) -- Should move to constructor
+  end)
+
+  it("Moves down from Ok class comment with tabstop=8", function()
+    vim.opt.tabstop = 8
+    vim.fn.cursor(121, 3) -- At "/**"
+    tw.move_down()
+    h.assert_cursor_at(124, 3) -- Should move to constructor
+  end)
+end)