Update comment detection logic for better jumping from comments

Also:

* Simplify the butts off of target's current node identification, making
  it more node wise than line start number wise
* Move some errant print statements in assert_highlighted so they only
  show on failures
* Fix up some comments and error strings

Author: aaronik

lua/treewalker/nodes.lua

@@ -282,7 +282,7 @@ function M.get_lines(node)
   return vim.split(text, "\n")
 end
 
--- get 1-indexed row of given node
+-- get 1-indexed start row of given node
 -- (so will work directly with vim.fn.cursor,
 -- and will reflect row as seen in the vim status line)
 ---@param node TSNode
@@ -302,7 +302,7 @@ function M.get_erow(node)
   return row + 1
 end
 
--- get 1-indexed column of given node
+-- get 1-indexed start column of given node
 -- (so will work directly with vim.fn.cursor,
 -- and will reflect col as seen in the vim status line)
 ---@param node TSNode
@@ -340,7 +340,7 @@ end
 ---@return TSNode
 function M.get_current()
   local current = vim.treesitter.get_node({ ignore_injections = false })
-  assert(current, "Treewalker: Treesitter node not found under cursor. This shouldn't happen!")
+  assert(current, "Treewalker: Treesitter node not found under cursor. Missing parser?")
   return current
 end
 

lua/treewalker/targets.lua

@@ -1,4 +1,3 @@
-local lines = require "treewalker.lines"
 local nodes = require "treewalker.nodes"
 local strategies = require "treewalker.strategies"
 local util = require "treewalker.util"
@@ -7,25 +6,12 @@ local markdown_targets = require "treewalker.markdown.targets"
 local M = {}
 
 -- Gets a bunch of information about where the user currently is.
--- I don't really like this here, I wish everything ran on nodes.
--- But the node information is often wrong, like the current node
--- could come back as a bigger containing scope, and the behavior
--- would be unintuitive.
 ---@return integer, integer
 local function current()
   local current_row = vim.fn.line(".")
-  local current_line = lines.get_line(current_row)
-  assert(current_line, "Treewalker: cursor is on invalid line number")
-
-  -- When on a non-jump-target node (like a comment), use actual cursor column
-  -- instead of the line's start column to allow movement to differently indented code
   local current_node = nodes.get_current()
-  if current_node and not nodes.is_jump_target(current_node) then
-    return current_row, vim.fn.col(".")
-  end
-
-  local current_col = lines.get_start_col(current_line)
-  return current_row, current_col
+  local highest_coincident = nodes.get_highest_row_coincident(current_node)
+  return current_row, nodes.get_scol(highest_coincident)
 end
 
 ---Get the highest coincident; helper

tests/treewalker/helpers.lua

@@ -106,18 +106,18 @@ function M.assert_highlighted(srow, scol, erow, ecol)
     local actual_erow = highlight[4].end_row + 1
     local actual_ecol = highlight[4].end_col
 
-    print("actual_srow:", actual_srow)
-    print("actual_scol:", actual_scol)
-    print("actual_erow:", actual_erow)
-    print("actual_ecol:", actual_ecol)
-
     if
         srow == actual_srow
         and scol == actual_scol
         and erow == actual_erow
         and ecol == actual_ecol
     then
       return true
+    else
+      print("actual_srow:", actual_srow)
+      print("actual_scol:", actual_scol)
+      print("actual_erow:", actual_erow)
+      print("actual_ecol:", actual_ecol)
     end
   end
 

tests/treewalker/missing_parser_spec.lua

@@ -31,7 +31,9 @@ describe("For a file in which there is a missing parser", function()
 end)
 
 describe("For a file in which there is a parser present", function()
-  load_fixture("/lua.lua")
+  before_each(function()
+    load_fixture("/lua.lua")
+  end)
 
   for nam, command in pairs(commands) do
     it(string.format("does not notify when %s is called", nam), function()
@@ -59,4 +61,3 @@ describe("For a file in which there is a missing parser, when notifications are
     end)
   end
 end)
-

tests/treewalker/typescript_spec.lua

@@ -31,5 +31,13 @@ describe("In a typescript file:", function()
     vim.fn.cursor(115, 1)
     tw.move_down()
     h.assert_cursor_at(117, 1)
+
+    vim.fn.cursor(115, 3)
+    tw.move_down()
+    h.assert_cursor_at(117, 1)
+
+    vim.fn.cursor(115, 7)
+    tw.move_down()
+    h.assert_cursor_at(117, 1)
   end)
 end)