Skip to content

Commit ca47f40

Browse files
committed
refactor(snacks): use codediff Lua API directly instead of vim.cmd
1 parent e9be00a commit ca47f40

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

lua/plugins/snacks.picker.lua

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ end
1212
local git_log_on_confirm = function(picker, item)
1313
picker:close()
1414
local selected = picker:selected()
15+
require("lazy").load({ plugins = { "codediff.nvim" } })
16+
local diff = require("codediff.commands").vscode_diff
1517
if #selected == 1 then
16-
vim.cmd("CodeDiff " .. selected[1].commit .. "~1 HEAD")
18+
diff({ fargs = { selected[1].commit .. "~1", "HEAD" } })
1719
elseif #selected > 1 then
18-
local first = selected[2].commit
19-
local last = selected[1].commit
20-
vim.cmd("CodeDiff " .. first .. "~1 " .. last)
20+
diff({ fargs = { selected[#selected].commit .. "~1", selected[1].commit } })
2121
else
22-
vim.cmd("CodeDiff " .. item.commit .. "~1 " .. item.commit)
22+
diff({ fargs = { item.commit .. "~1", item.commit } })
2323
end
2424
end
2525

@@ -138,7 +138,7 @@ return {
138138
{ "<leader>hl%", picker("git_log_file"), desc = "Git: Log for file" },
139139
{ "<leader>hb", picker("git_branches"), desc = "Git: Branches" },
140140
{ "<leader>hh", picker("git_status"), desc = "Git: Status" },
141-
{ "<leader>hll", picker("git_log"), desc = "Git: Search Log" },
141+
{ "<leader>hL", picker("git_log"), desc = "Git: Search Log" },
142142

143143
{ "<leader>cc", picker("qflist"), desc = "Quickfix List" },
144144

@@ -230,10 +230,8 @@ return {
230230
actions = {
231231
diff = function(picker, item)
232232
picker:close()
233-
234-
-- Open diff for the branch compared to the default branch
235-
local base = T.git.default_branch()
236-
vim.cmd("CodeDiff " .. base .. " " .. item.branch)
233+
require("lazy").load({ plugins = { "codediff.nvim" } })
234+
require("codediff.commands").vscode_diff({ fargs = { T.git.default_branch(), item.branch } })
237235
end,
238236
toggle_filter = function(picker)
239237
picker.opts.all = not picker.opts.all

0 commit comments

Comments
 (0)