Simplified fix - minimal changes (Sun Nov 2 12:46:39 PST 2025)

Author: aaronik

lua/treewalker/targets.lua

@@ -32,42 +32,12 @@ function M.out(node)
     return markdown_targets.out()
   end
 
-  -- Special handling for comments - try direct approach first
-  local cursor_pos = vim.api.nvim_win_get_cursor(0)
-  local cursor_row, cursor_col = cursor_pos[1] - 1, cursor_pos[2] -- Convert to 0-indexed
-
-  -- Special handling for comments - direct approach to find containing declarations
-  local actual_node = vim.treesitter.get_node({ pos = { cursor_row, cursor_col } })
-  if actual_node and actual_node:type():match("comment") then
-    -- Walk up the tree to find a class_declaration or function_declaration
-    local parent = actual_node:parent()
-    while parent do
-      if parent:type() == "class_declaration" and nodes.is_jump_target(parent) then
-        local target_row = nodes.get_srow(parent)
-        return parent, target_row
-      elseif parent:type() == "function_declaration" and nodes.is_jump_target(parent) then
-        local target_row = nodes.get_srow(parent)
-        return parent, target_row
-      end
-      parent = parent:parent()
-    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
 
-  -- Handle comments: if we're in a comment and the candidate is a body node,
-  -- 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
-
   candidate = coincident(candidate)
   if not candidate then return end
   local row = nodes.get_srow(candidate)