added simple implementation of visual mode holdswapping

Author: spiderforrest

README.md

@@ -110,7 +110,7 @@ The .go_to_top_node_and_execute_commands() method takes 2 arguments:
 
 1. boolean: if false then it will jump to the beginning of the node, if true it jumps to the end.
 
-1. lua table: a table that contains strings, each tring is a vim command example: { "normal! O", "normal! O", "startinsert" }
+1. lua table: a table that contains strings, each string is a vim command example: { "normal! O", "normal! O", "startinsert" }
 
 ---
 
@@ -267,4 +267,6 @@ Example mapping:
 ```lua
 -- Holds a node, or swaps the held node
 vim.keymap.set("n", "gnh", "<cmd>STSSwapOrHold<cr>", opts)
+-- Same for visual
+vim.keymap.set("x", "gnh", "<cmd>STSSwapOrHoldVisual<cr>", opts)
 ```

lua/syntax-tree-surfer/init.lua

@@ -63,53 +63,73 @@ function M.update_selection(buf, node, selection_mode) -- rip from the old ts_ut
 	vim.fn.setpos(".", { buf, end_row, end_col, 0 })
 end --}}}
 
-M.surf = function(direction, mode, move) --{{{
+local get_visual_node = function() --{{{
 	local node = ts_utils.get_node_at_cursor() -- declare node and bufnr
-	local bufnr = vim.api.nvim_get_current_buf()
 
 	if node == nil then -- prevent errors
 		return
 	end
 
-	if mode == "visual" then
-		local nodeA = node
-		vim.cmd("normal! o")
-		local nodeB = ts_utils.get_node_at_cursor()
-		vim.cmd("normal! o")
-		local root = ts_utils.get_root_for_node(node)
-
-		if nodeA:id() ~= nodeB:id() then --> get the true node
-			local true_range = find_range_from_2nodes(nodeA, nodeB)
-			local parent = nodeA:parent()
-			local start_row_P, start_col_P, end_row_P, end_col_P = parent:range()
-
-			while
-				start_row_P ~= true_range[1]
-				or start_col_P ~= true_range[2]
-				or end_row_P ~= true_range[3]
-				or end_col_P ~= true_range[4]
-			do
-				if parent:parent() == nil then
-					break
-				end
-				parent = parent:parent()
-				start_row_P, start_col_P, end_row_P, end_col_P = parent:range()
-			end
+    local nodeA = node
+    vim.cmd("normal! o")
+    local nodeB = ts_utils.get_node_at_cursor()
+    vim.cmd("normal! o")
+    local root = ts_utils.get_root_for_node(node)
+
+    if nodeA:id() ~= nodeB:id() then --> get the true node
+        local true_range = find_range_from_2nodes(nodeA, nodeB)
+        local parent = nodeA:parent()
+        local start_row_P, start_col_P, end_row_P, end_col_P = parent:range()
+
+        while
+            start_row_P ~= true_range[1]
+            or start_col_P ~= true_range[2]
+            or end_row_P ~= true_range[3]
+            or end_col_P ~= true_range[4]
+        do
+            if parent:parent() == nil then
+                break
+            end
+            parent = parent:parent()
+            start_row_P, start_col_P, end_row_P, end_col_P = parent:range()
+        end
 
-			node = parent
-		end
+        node = parent
+    end
 
-		if node == root then -- catch some edge cases
-			node = nodeA
-		end
-	end
+    if node == root then -- catch some edge cases
+        node = nodeA
+    end
 
 	local parent = node:parent() --> if parent only has 1 child, move up the tree
 	while parent ~= nil and parent:named_child_count() == 1 do
 		node = parent
 		parent = node:parent()
 	end
 
+    return node
+
+end --}}}
+
+M.surf = function(direction, mode, move) --{{{
+	local node = ts_utils.get_node_at_cursor() -- declare node and bufnr
+	local bufnr = vim.api.nvim_get_current_buf()
+
+	if node == nil then -- prevent errors
+		return
+	end
+
+	if mode == "visual" then-- {{{
+		node = get_visual_node()
+	else
+		local parent = node:parent()
+		while parent ~= nil and parent:named_child_count() == 1 do
+			node = parent
+			parent = node:parent()
+		end
+	end --}}}
+
+
 	local target --> setting the target, depending on the direction
 	if direction == "parent" then
 		target = node:parent()
@@ -866,22 +886,22 @@ end, {})
 
 -- version 2.2
 
+
 local held_node = nil --store the held node internally
-local function hold_focused_node() --{{{
-	local new_node = ts_utils.get_node_at_cursor()
+local function hold_node(node) --{{{
 	local bufnr = vim.api.nvim_get_current_buf()
 
-	if new_node ~= nil then
-        local end_row, end_col = new_node:end_()
+	if node ~= nil then
+        local end_row, end_col = node:end_()
 
         --clear old extmark
         if held_node and held_node.extmark_id then
-            api.nvim_buf_del_extmark(0, ns, held_node.extmark_id)
+            -- api.nvim_buf_del_extmark(0, ns, held_node.extmark_id)
         end
 
         -- store the held node with extra data for checks/extmark deletion
         held_node = {
-            node = new_node,
+            node = node,
             bufnr = bufnr,
             extmark_id = set_extmark_then_delete_it( -- set the extmark and save it for deletion
                 end_row,
@@ -894,11 +914,11 @@ local function hold_focused_node() --{{{
 	end
 end --}}}
 
-local function swap_held_and_focused_node() --{{{
+local function swap_held_node(node) --{{{
 	local bufnr = vim.api.nvim_get_current_buf()
 
 	if  held_node ~= nil and held_node.bufnr == bufnr then -- make sure we're swapping nodes in the same buffer
-		ts_utils.swap_nodes(held_node.node, ts_utils.get_node_at_cursor(), bufnr, true)
+		ts_utils.swap_nodes(held_node.node, node, bufnr, true)
         api.nvim_buf_del_extmark(0, ns, held_node.extmark_id) --clear the extmark, probably don't need it after this
         held_node = nil
     else
@@ -910,16 +930,28 @@ local function swap_held_and_focused_node() --{{{
 	end
 end --}}}
 
-local function hold_or_swap() --{{{
+local function hold_or_swap(visual_mode) --{{{
     if held_node == nil then
-        hold_focused_node()
+		if visual_mode then
+			hold_node(get_visual_node())
+		else
+			hold_node(ts_utils.get_node_at_cursor())
+		end
     else
-        swap_held_and_focused_node()
+		if visual_mode then
+			swap_held_node(get_visual_node())
+		else
+			swap_held_node(ts_utils.get_node_at_cursor())
+		end
     end
 end --}}}
 
 vim.api.nvim_create_user_command("STSSwapOrHold", function()
-    hold_or_swap()
+    hold_or_swap(false)
+end, {})
+
+vim.api.nvim_create_user_command("STSSwapOrHoldVisual", function()
+    hold_or_swap(true)
 end, {})
 
 return M