fix: implement proper nvim-tree visual selection support

ThomasK33 · ThomasK33 · commit 9952bd4ced03 · 2025-06-08T10:07:47.000+02:00
- Replace fallback to single-file selection with line-by-line node mapping
- Support visual line selection (V), character selection (v), and block selection (Ctrl-V)
- Add comprehensive test suite for nvim-tree visual selection scenarios
- Include deduplication and root-level file filtering
- Maintain compatibility with existing nvim-tree marks functionality

Fixes issue where multi-selection in nvim-tree only sent cursor file instead of all selected files.

Change-Id: Ida7b3154f0b6749903ff0e847752d5c263a09de7
Signed-off-by: Thomas Kosiewski &lt;tk@coder.com&gt;
diff --git a/lua/claudecode/visual_commands.lua b/lua/claudecode/visual_commands.lua
@@ -275,16 +275,69 @@ function M.get_files_from_visual_selection(visual_data)
       end
     end
   elseif tree_type == "nvim-tree" then
-    -- For nvim-tree, we'll fall back to using the integrations module
-    -- since nvim-tree doesn't have the same line-to-node mapping as neo-tree
-    local integrations = require("claudecode.integrations")
-    local tree_files, tree_err = integrations._get_nvim_tree_selection()
-
-    if tree_err then
-      return {}, tree_err
+    -- For nvim-tree, we need to manually map visual lines to tree nodes
+    -- since nvim-tree doesn't have direct line-to-node mapping like neo-tree
+    require("claudecode.logger").debug(
+      "visual_commands",
+      "Processing nvim-tree visual selection from line",
+      start_pos,
+      "to",
+      end_pos
+    )
+
+    local nvim_tree_api = tree_state
+    local current_buf = vim.api.nvim_get_current_buf()
+
+    -- Get all lines in the visual selection
+    local lines = vim.api.nvim_buf_get_lines(current_buf, start_pos - 1, end_pos, false)
+
+    require("claudecode.logger").debug("visual_commands", "Found", #lines, "lines in visual selection")
+
+    -- For each line in the visual selection, try to get the corresponding node
+    for i, line_content in ipairs(lines) do
+      local line_num = start_pos + i - 1
+
+      -- Set cursor to this line to get the node
+      pcall(vim.api.nvim_win_set_cursor, 0, { line_num, 0 })
+
+      -- Get node under cursor for this line
+      local node_success, node = pcall(nvim_tree_api.tree.get_node_under_cursor)
+      if node_success and node then
+        require("claudecode.logger").debug(
+          "visual_commands",
+          "Line",
+          line_num,
+          "node type:",
+          node.type,
+          "path:",
+          node.absolute_path
+        )
+
+        if node.type == "file" and node.absolute_path and node.absolute_path ~= "" then
+          -- Check if it's not a root-level file (basic protection)
+          if not string.match(node.absolute_path, "^/[^/]*$") then
+            table.insert(files, node.absolute_path)
+          end
+        elseif node.type == "directory" and node.absolute_path and node.absolute_path ~= "" then
+          table.insert(files, node.absolute_path)
+        end
+      else
+        require("claudecode.logger").debug("visual_commands", "No valid node found for line", line_num)
+      end
     end
 
-    files = tree_files
+    require("claudecode.logger").debug("visual_commands", "Extracted", #files, "files from nvim-tree visual selection")
+
+    -- Remove duplicates while preserving order
+    local seen = {}
+    local unique_files = {}
+    for _, file_path in ipairs(files) do
+      if not seen[file_path] then
+        seen[file_path] = true
+        table.insert(unique_files, file_path)
+      end
+    end
+    files = unique_files
   end
 
   return files, nil
diff --git a/tests/unit/nvim_tree_visual_selection_spec.lua b/tests/unit/nvim_tree_visual_selection_spec.lua
@@ -0,0 +1,237 @@
+-- luacheck: globals expect
+require("tests.busted_setup")
+
+describe("NvimTree Visual Selection", function()
+  local visual_commands
+  local mock_vim
+
+  local function setup_mocks()
+    package.loaded["claudecode.visual_commands"] = nil
+    package.loaded["claudecode.logger"] = nil
+
+    -- Mock logger
+    package.loaded["claudecode.logger"] = {
+      debug = function() end,
+      warn = function() end,
+      error = function() end,
+    }
+
+    mock_vim = {
+      fn = {
+        mode = function()
+          return "V" -- Visual line mode
+        end,
+        getpos = function(mark)
+          if mark == "'<" then
+            return { 0, 2, 0, 0 } -- Start at line 2
+          elseif mark == "'>" then
+            return { 0, 4, 0, 0 } -- End at line 4
+          elseif mark == "v" then
+            return { 0, 2, 0, 0 } -- Anchor at line 2
+          end
+          return { 0, 0, 0, 0 }
+        end,
+      },
+      api = {
+        nvim_get_current_win = function()
+          return 1002
+        end,
+        nvim_get_mode = function()
+          return { mode = "V" }
+        end,
+        nvim_get_current_buf = function()
+          return 1
+        end,
+        nvim_win_get_cursor = function()
+          return { 4, 0 } -- Cursor at line 4
+        end,
+        nvim_buf_get_lines = function(buf, start, end_line, strict)
+          -- Return mock buffer lines for the visual selection
+          return {
+            "  📁 src/",
+            "  📄 init.lua",
+            "  📄 config.lua",
+          }
+        end,
+        nvim_win_set_cursor = function(win, pos)
+          -- Mock cursor setting
+        end,
+        nvim_replace_termcodes = function(keys, from_part, do_lt, special)
+          return keys
+        end,
+      },
+      bo = { filetype = "NvimTree" },
+      schedule = function(fn)
+        fn()
+      end,
+    }
+
+    _G.vim = mock_vim
+  end
+
+  before_each(function()
+    setup_mocks()
+  end)
+
+  describe("nvim-tree visual selection handling", function()
+    before_each(function()
+      visual_commands = require("claudecode.visual_commands")
+    end)
+
+    it("should extract files from visual selection in nvim-tree", function()
+      -- Create a stateful mock that tracks cursor position
+      local cursor_positions = {}
+      local expected_nodes = {
+        [2] = { type = "directory", absolute_path = "/Users/test/project/src" },
+        [3] = { type = "file", absolute_path = "/Users/test/project/init.lua" },
+        [4] = { type = "file", absolute_path = "/Users/test/project/config.lua" },
+      }
+
+      mock_vim.api.nvim_win_set_cursor = function(win, pos)
+        cursor_positions[#cursor_positions + 1] = pos[1]
+      end
+
+      local mock_nvim_tree_api = {
+        tree = {
+          get_node_under_cursor = function()
+            local current_line = cursor_positions[#cursor_positions] or 2
+            return expected_nodes[current_line]
+          end,
+        },
+      }
+
+      local visual_data = {
+        tree_state = mock_nvim_tree_api,
+        tree_type = "nvim-tree",
+        start_pos = 2,
+        end_pos = 4,
+      }
+
+      local files, err = visual_commands.get_files_from_visual_selection(visual_data)
+
+      expect(err).to_be_nil()
+      expect(files).to_be_table()
+      expect(#files).to_be(3)
+      expect(files[1]).to_be("/Users/test/project/src")
+      expect(files[2]).to_be("/Users/test/project/init.lua")
+      expect(files[3]).to_be("/Users/test/project/config.lua")
+    end)
+
+    it("should handle empty visual selection in nvim-tree", function()
+      local mock_nvim_tree_api = {
+        tree = {
+          get_node_under_cursor = function()
+            return nil -- No node found
+          end,
+        },
+      }
+
+      local visual_data = {
+        tree_state = mock_nvim_tree_api,
+        tree_type = "nvim-tree",
+        start_pos = 2,
+        end_pos = 2,
+      }
+
+      local files, err = visual_commands.get_files_from_visual_selection(visual_data)
+
+      expect(err).to_be_nil()
+      expect(files).to_be_table()
+      expect(#files).to_be(0)
+    end)
+
+    it("should filter out root-level files in nvim-tree", function()
+      local mock_nvim_tree_api = {
+        tree = {
+          get_node_under_cursor = function()
+            return {
+              type = "file",
+              absolute_path = "/root_file.txt", -- Root-level file should be filtered
+            }
+          end,
+        },
+      }
+
+      local visual_data = {
+        tree_state = mock_nvim_tree_api,
+        tree_type = "nvim-tree",
+        start_pos = 1,
+        end_pos = 1,
+      }
+
+      local files, err = visual_commands.get_files_from_visual_selection(visual_data)
+
+      expect(err).to_be_nil()
+      expect(files).to_be_table()
+      expect(#files).to_be(0) -- Root-level file should be filtered out
+    end)
+
+    it("should remove duplicate files in visual selection", function()
+      local call_count = 0
+      local mock_nvim_tree_api = {
+        tree = {
+          get_node_under_cursor = function()
+            call_count = call_count + 1
+            -- Return the same file path twice to test deduplication
+            return {
+              type = "file",
+              absolute_path = "/Users/test/project/duplicate.lua",
+            }
+          end,
+        },
+      }
+
+      local visual_data = {
+        tree_state = mock_nvim_tree_api,
+        tree_type = "nvim-tree",
+        start_pos = 1,
+        end_pos = 2, -- Two lines, same file
+      }
+
+      local files, err = visual_commands.get_files_from_visual_selection(visual_data)
+
+      expect(err).to_be_nil()
+      expect(files).to_be_table()
+      expect(#files).to_be(1) -- Should have only one instance
+      expect(files[1]).to_be("/Users/test/project/duplicate.lua")
+    end)
+
+    it("should handle mixed file and directory selection", function()
+      local cursor_positions = {}
+      local expected_nodes = {
+        [1] = { type = "directory", absolute_path = "/Users/test/project/lib" },
+        [2] = { type = "file", absolute_path = "/Users/test/project/main.lua" },
+        [3] = { type = "directory", absolute_path = "/Users/test/project/tests" },
+      }
+
+      mock_vim.api.nvim_win_set_cursor = function(win, pos)
+        cursor_positions[#cursor_positions + 1] = pos[1]
+      end
+
+      local mock_nvim_tree_api = {
+        tree = {
+          get_node_under_cursor = function()
+            local current_line = cursor_positions[#cursor_positions] or 1
+            return expected_nodes[current_line]
+          end,
+        },
+      }
+
+      local visual_data = {
+        tree_state = mock_nvim_tree_api,
+        tree_type = "nvim-tree",
+        start_pos = 1,
+        end_pos = 3,
+      }
+
+      local files, err = visual_commands.get_files_from_visual_selection(visual_data)
+
+      expect(err).to_be_nil()
+      expect(files).to_be_table()
+      expect(#files).to_be(3)
+      expect(files[1]).to_be("/Users/test/project/lib")
+      expect(files[2]).to_be("/Users/test/project/main.lua")
+      expect(files[3]).to_be("/Users/test/project/tests")
+    end)
+  end)
+end)
