added swaparound feature

Author: mlysle

lua/treewalker/init.lua

@@ -11,6 +11,7 @@ Treewalker.opts = {
   highlight_duration = 250,
   highlight_group = "CursorLine",
   jumplist = true,
+  swaparound = true
 }
 
 -- This does not need to be called for Treewalker to work. The defaults are preinitialized and aim to be sane.

lua/treewalker/nodes.lua

@@ -176,6 +176,22 @@ function M.next_sib(node)
   return node:next_named_sibling()
 end
 
+---@param node TSNode
+---@param fn function
+---@return TSNode | nil
+function M.farthest_sibling(node, fn)
+  if not node then return nil end
+
+  ---@type TSNode | nil
+  local iter = fn(node)
+
+  while iter do
+    node = iter
+    iter = fn(iter)
+  end
+  return node
+end
+
 -- Convenience for give me back prev sibling of a potentially nil node
 ---@param node TSNode | nil
 function M.prev_sib(node)

lua/treewalker/swap.lua

@@ -121,7 +121,7 @@ function M.swap_right()
   current = strategies.get_highest_string_node(current) or current
   current = nodes.get_highest_coincident(current)
 
-  local target = nodes.next_sib(current)
+  local target = nodes.next_sib(current) or nodes.farthest_sibling(current, nodes.prev_sib)
 
   if not current or not target then return end
 
@@ -158,7 +158,7 @@ function M.swap_left()
   current = strategies.get_highest_string_node(current) or current
   current = nodes.get_highest_coincident(current)
 
-  local target = nodes.prev_sib(current)
+  local target = nodes.prev_sib(current) or nodes.farthest_sibling(current, nodes.next_sib)
 
   if not current or not target then return end