feat: add multi-file visual selection support to mini.files integration

jdurand · jdurand · commit 07459d51f88d · 2025-07-29T01:57:23.000-04:00
This update introduces support for visual mode multi-file selection in
mini.files integration. Users can now select multiple files in visual
mode and send them all to Claude Code at once.
diff --git a/lua/claudecode/init.lua b/lua/claudecode/init.lua
@@ -611,8 +611,10 @@ function M._create_commands()
     local is_tree_buffer = current_ft == "NvimTree"
       or current_ft == "neo-tree"
       or current_ft == "oil"
+      or current_ft == "minifiles"
       or string.match(current_bufname, "neo%-tree")
       or string.match(current_bufname, "NvimTree")
+      or string.match(current_bufname, "minifiles://")
 
     if is_tree_buffer then
       local integrations = require("claudecode.integrations")
@@ -656,7 +658,54 @@ function M._create_commands()
   end
 
   local function handle_send_visual(visual_data, _opts)
-    -- Try tree file selection first
+    -- Check if we're in a tree buffer first
+    local current_ft = (vim.bo and vim.bo.filetype) or ""
+    local current_bufname = (vim.api and vim.api.nvim_buf_get_name and vim.api.nvim_buf_get_name(0)) or ""
+    
+    local is_tree_buffer = current_ft == "NvimTree"
+      or current_ft == "neo-tree"
+      or current_ft == "oil"
+      or current_ft == "minifiles"
+      or string.match(current_bufname, "neo%-tree")
+      or string.match(current_bufname, "NvimTree")
+      or string.match(current_bufname, "minifiles://")
+
+    if is_tree_buffer then
+      local integrations = require("claudecode.integrations")
+      local files, error
+      
+      -- For mini.files, try to get the range from visual marks
+      if current_ft == "minifiles" or string.match(current_bufname, "minifiles://") then
+        local start_line = vim.fn.line("'<")
+        local end_line = vim.fn.line("'>")
+        
+        
+        if start_line > 0 and end_line > 0 and start_line <= end_line then
+          -- Use range-based selection for mini.files
+          files, error = integrations._get_mini_files_selection_with_range(start_line, end_line)
+        else
+          -- Fall back to regular method
+          files, error = integrations.get_selected_files_from_tree()
+        end
+      else
+        files, error = integrations.get_selected_files_from_tree()
+      end
+
+      if error then
+        logger.error("command", "ClaudeCodeSend_visual->TreeAdd: " .. error)
+        return
+      end
+
+      if not files or #files == 0 then
+        logger.warn("command", "ClaudeCodeSend_visual->TreeAdd: No files selected")
+        return
+      end
+
+      add_paths_to_claude(files, { context = "ClaudeCodeSend_visual->TreeAdd" })
+      return
+    end
+
+    -- Fall back to old visual selection logic for non-tree buffers
     if visual_data then
       local visual_commands = require("claudecode.visual_commands")
       local files, error = visual_commands.get_files_from_visual_selection(visual_data)
diff --git a/lua/claudecode/integrations.lua b/lua/claudecode/integrations.lua
@@ -268,49 +268,73 @@ end
 --- Reference: mini.files API MiniFiles.get_fs_entry()
 --- @return table files List of file paths
 --- @return string|nil error Error message if operation failed
-function M._get_mini_files_selection()
+
+-- Helper function to get mini.files selection using explicit range
+function M._get_mini_files_selection_with_range(start_line, end_line)
   local success, mini_files = pcall(require, "mini.files")
   if not success then
     return {}, "mini.files not available"
   end
 
   local files = {}
-
-  -- Check if we're in visual mode for multi-selection
-  local mode = vim.fn.mode()
-  if mode == "V" or mode == "v" or mode == "\22" then
-    -- Visual mode: get visual range
-    local visual_commands = require("claudecode.visual_commands")
-    local start_line, end_line = visual_commands.get_visual_range()
-
-    -- Process each line in the visual selection
-    for line = start_line, end_line do
-      local entry_ok, entry = pcall(mini_files.get_fs_entry, nil, line)
-      if entry_ok and entry and entry.path then
-        -- Validate that the path exists
-        if vim.fn.filereadable(entry.path) == 1 or vim.fn.isdirectory(entry.path) == 1 then
-          table.insert(files, entry.path)
-        end
+  local bufnr = vim.api.nvim_get_current_buf()
+  
+  -- Process each line in the range
+  for line = start_line, end_line do
+    local entry_ok, entry = pcall(mini_files.get_fs_entry, bufnr, line)
+    
+    if entry_ok and entry and entry.path and entry.path ~= "" then
+      -- Extract real filesystem path from mini.files buffer path
+      local real_path = entry.path
+      -- Remove mini.files buffer protocol prefix if present
+      if real_path:match("^minifiles://") then
+        real_path = real_path:gsub("^minifiles://[^/]*/", "")
       end
-    end
 
-    if #files > 0 then
-      return files, nil
+      -- Validate that the path exists
+      if vim.fn.filereadable(real_path) == 1 or vim.fn.isdirectory(real_path) == 1 then
+        table.insert(files, real_path)
+      end
     end
+  end
+  
+  if #files > 0 then
+    return files, nil
   else
-    -- Normal mode: get file under cursor
-    local entry_ok, entry = pcall(mini_files.get_fs_entry)
-    if not entry_ok or not entry then
-      return {}, "Failed to get entry from mini.files"
-    end
+    return {}, "No files found in range"
+  end
+end
 
-    if entry.path and entry.path ~= "" then
-      -- Validate that the path exists
-      if vim.fn.filereadable(entry.path) == 1 or vim.fn.isdirectory(entry.path) == 1 then
-        return { entry.path }, nil
-      else
-        return {}, "Invalid file or directory path: " .. entry.path
-      end
+function M._get_mini_files_selection()
+  local success, mini_files = pcall(require, "mini.files")
+  if not success then
+    return {}, "mini.files not available"
+  end
+
+  local files = {}
+
+  local bufnr = vim.api.nvim_get_current_buf()
+
+
+  -- Normal mode: get file under cursor
+  local entry_ok, entry = pcall(mini_files.get_fs_entry, bufnr)
+  if not entry_ok or not entry then
+    return {}, "Failed to get entry from mini.files"
+  end
+
+  if entry.path and entry.path ~= "" then
+    -- Extract real filesystem path from mini.files buffer path
+    local real_path = entry.path
+    -- Remove mini.files buffer protocol prefix if present
+    if real_path:match("^minifiles://") then
+      real_path = real_path:gsub("^minifiles://[^/]*/", "")
+    end
+    
+    -- Validate that the path exists
+    if vim.fn.filereadable(real_path) == 1 or vim.fn.isdirectory(real_path) == 1 then
+      return { real_path }, nil
+    else
+      return {}, "Invalid file or directory path: " .. real_path
     end
   end
 
diff --git a/tests/unit/mini_files_integration_spec.lua b/tests/unit/mini_files_integration_spec.lua
@@ -42,6 +42,11 @@ describe("mini.files integration", function()
           return 0
         end,
       },
+      api = {
+        nvim_get_current_buf = function()
+          return 1 -- Mock buffer ID
+        end
+      },
       bo = { filetype = "minifiles" },
     }
 
@@ -57,7 +62,11 @@ describe("mini.files integration", function()
     it("should get single file under cursor", function()
       -- Mock mini.files module
       local mock_mini_files = {
-        get_fs_entry = function()
+        get_fs_entry = function(buf_id)
+          -- Verify buffer ID is passed correctly
+          if buf_id ~= 1 then
+            return nil
+          end
           return { path = "/Users/test/project/main.lua" }
         end,
       }
@@ -74,7 +83,11 @@ describe("mini.files integration", function()
     it("should get directory under cursor", function()
       -- Mock mini.files module
       local mock_mini_files = {
-        get_fs_entry = function()
+        get_fs_entry = function(buf_id)
+          -- Verify buffer ID is passed correctly
+          if buf_id ~= 1 then
+            return nil
+          end
           return { path = "/Users/test/project/src" }
         end,
       }
@@ -88,22 +101,14 @@ describe("mini.files integration", function()
       expect(files[1]).to_be("/Users/test/project/src")
     end)
 
-    it("should get multiple files in visual mode", function()
-      mock_vim.fn.mode = function()
-        return "V" -- Visual line mode
-      end
-
-      -- Mock mini.files module
+    it("should handle mini.files buffer path format", function()
+      -- Mock mini.files module that returns buffer-style paths
       local mock_mini_files = {
-        get_fs_entry = function(buf_id, line)
-          if line == 1 then
-            return { path = "/Users/test/project/file1.lua" }
-          elseif line == 2 then
-            return { path = "/Users/test/project/file2.lua" }
-          elseif line == 3 then
-            return { path = "/Users/test/project/src" }
+        get_fs_entry = function(buf_id)
+          if buf_id ~= 1 then
+            return nil
           end
-          return nil
+          return { path = "minifiles://42//Users/test/project/buffer_file.lua" }
         end,
       }
       package.loaded["mini.files"] = mock_mini_files
@@ -112,41 +117,40 @@ describe("mini.files integration", function()
 
       expect(err).to_be_nil()
       expect(files).to_be_table()
-      expect(#files).to_be(3)
-      expect(files[1]).to_be("/Users/test/project/file1.lua")
-      expect(files[2]).to_be("/Users/test/project/file2.lua")
-      expect(files[3]).to_be("/Users/test/project/src")
+      expect(#files).to_be(1)
+      expect(files[1]).to_be("/Users/test/project/buffer_file.lua")
     end)
 
-    it("should filter out invalid files in visual mode", function()
-      mock_vim.fn.mode = function()
-        return "V" -- Visual line mode
-      end
-
-      -- Mock mini.files module
-      local mock_mini_files = {
-        get_fs_entry = function(buf_id, line)
-          if line == 1 then
-            return { path = "/Users/test/project/valid.lua" }
-          elseif line == 2 then
-            return { path = "/Users/test/project/invalid.xyz" } -- Won't pass filereadable/isdirectory
-          elseif line == 3 then
-            return { path = "/Users/test/project/src" }
-          end
-          return nil
-        end,
+    it("should handle various mini.files buffer path formats", function()
+      -- Test different buffer path formats that could occur
+      local test_cases = {
+        { input = "minifiles://42/Users/test/file.lua", expected = "Users/test/file.lua" },
+        { input = "minifiles://42//Users/test/file.lua", expected = "/Users/test/file.lua" },
+        { input = "minifiles://123///Users/test/file.lua", expected = "//Users/test/file.lua" },
+        { input = "/Users/test/normal_path.lua", expected = "/Users/test/normal_path.lua" },
       }
-      package.loaded["mini.files"] = mock_mini_files
-
-      local files, err = integrations._get_mini_files_selection()
 
-      expect(err).to_be_nil()
-      expect(files).to_be_table()
-      expect(#files).to_be(2) -- Only valid.lua and src
-      expect(files[1]).to_be("/Users/test/project/valid.lua")
-      expect(files[2]).to_be("/Users/test/project/src")
+      for i, test_case in ipairs(test_cases) do
+        local mock_mini_files = {
+          get_fs_entry = function(buf_id)
+            if buf_id ~= 1 then
+              return nil
+            end
+            return { path = test_case.input }
+          end,
+        }
+        package.loaded["mini.files"] = mock_mini_files
+
+        local files, err = integrations._get_mini_files_selection()
+
+        expect(err).to_be_nil()
+        expect(files).to_be_table()
+        expect(#files).to_be(1)
+        expect(files[1]).to_be(test_case.expected)
+      end
     end)
 
+
     it("should handle empty entry under cursor", function()
       -- Mock mini.files module
       local mock_mini_files = {
@@ -229,25 +233,6 @@ describe("mini.files integration", function()
       expect(#files).to_be(0)
     end)
 
-    it("should handle visual mode with no valid entries", function()
-      mock_vim.fn.mode = function()
-        return "V" -- Visual line mode
-      end
-
-      -- Mock mini.files module
-      local mock_mini_files = {
-        get_fs_entry = function(buf_id, line)
-          return nil -- No entries
-        end,
-      }
-      package.loaded["mini.files"] = mock_mini_files
-
-      local files, err = integrations._get_mini_files_selection()
-
-      expect(err).to_be("No file found under cursor")
-      expect(files).to_be_table()
-      expect(#files).to_be(0)
-    end)
   end)
 
   describe("get_selected_files_from_tree", function()
@@ -279,4 +264,4 @@ describe("mini.files integration", function()
       expect(files).to_be_nil()
     end)
   end)
-end)
+end)
