feat(git): Better pathspec completion.

Author: sindrets

lua/diffview/init.lua

@@ -190,7 +190,11 @@ M.completers = {
     local candidates = {}
 
     if ctx.argidx > ctx.divideridx then
-      utils.vec_push(candidates, unpack(vim.fn.getcompletion(ctx.arg_lead, "file", 0)))
+      if adapter then
+        utils.vec_push(candidates, unpack(adapter:path_completion(ctx.arg_lead)))
+      else
+        utils.vec_push(candidates, unpack(vim.fn.getcompletion(ctx.arg_lead, "file", 0)))
+      end
     elseif adapter then
       if not has_rev_arg and ctx.arg_lead:sub(1, 1) ~= "-" then
         utils.vec_push(candidates, unpack(adapter.comp.open:get_all_names()))
@@ -217,10 +221,11 @@ M.completers = {
         adapter.comp.file_history:get_completion(ctx.arg_lead)
         or adapter.comp.file_history:get_all_names()
       ))
+      utils.vec_push(candidates, unpack(adapter:path_completion(ctx.arg_lead)))
+    else
+      utils.vec_push(candidates, unpack(vim.fn.getcompletion(ctx.arg_lead, "file", 0)))
     end
 
-    utils.vec_push(candidates, unpack(vim.fn.getcompletion(ctx.arg_lead, "file", 0)))
-
     return candidates
   end,
 }

lua/diffview/vcs/adapter.lua

@@ -384,5 +384,11 @@ VCSAdapter.flags = {
   options = {},
 }
 
+---@param arg_lead string
+---@return string[]
+function VCSAdapter:path_completion(arg_lead)
+  return vim.fn.getcompletion(arg_lead, "file", 0)
+end
+
 M.VCSAdapter = VCSAdapter
 return M

lua/diffview/vcs/adapters/git/init.lua

@@ -30,7 +30,11 @@ GitAdapter.Rev = GitRev
 
 ---@return string, string
 function M.pathspec_split(pathspec)
-  local magic = pathspec:match("^:[/!^]*:?") or pathspec:match("^:%b()") or ""
+  local magic = utils.str_match(pathspec, {
+    "^:[/!^]+:?",
+    "^:%b()",
+    "^:",
+  }) or ""
   local pattern = pathspec:sub(1 + #magic, -1)
   return magic or "", pattern or ""
 end
@@ -1572,7 +1576,10 @@ GitAdapter.flags = {
           end, value)
         ), " ")
       end,
-      completion = function(_)
+      ---@param panel FHOptionPanel
+      completion = function(panel)
+        local view = panel.parent.parent
+
         return function(_, cmd_line, cur_pos)
           local ok, ctx = pcall(arg_parser.scan_sh_args, cmd_line, cur_pos)
 
@@ -1586,7 +1593,7 @@ GitAdapter.flags = {
                 utils.vec_slice(quoted, 1, ctx.argidx - 1),
                 utils.str_quote(v, { only_if_whitespace = true })
               ), " ")
-            end, vim.fn.getcompletion(ctx.arg_lead, "file"))
+            end, view.adapter:path_completion(ctx.arg_lead))
           end
         end
       end,
@@ -1641,6 +1648,14 @@ end
 
 -- Completion
 
+function GitAdapter:path_completion(arg_lead)
+  local magic, pattern = M.pathspec_split(arg_lead)
+
+  return vim.tbl_map(function(v)
+    return magic .. v
+  end, vim.fn.getcompletion(pattern, "file", 0))
+end
+
 function GitAdapter:rev_candidates()
   logger.lvl(1).debug("[completion] Revision candidates requested.")
   -- stylua: ignore start