mirrors/snacks.nvim
1
0
Fork 0
mirror of https://github.com/folke/snacks.nvim synced 2025-12-23 08:47:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(picker): renamed native -> builtin + fixed diff mode used for undo. Closes #1302

Browse source
This commit is contained in:
Folke Lemaitre 2025-02-19 16:54:53 +01:00
parent 92786c5b03
commit bd6a62af12
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
3 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lua/snacks/picker/config/defaults.lua
View file

@ -164,11 +164,11 @@ local defaults = {
---@class snacks.picker.previewers.Config
previewers = {
diff = {
native = false, -- use native (terminal) or Neovim for previewing git diffs and commits
builtin = true, -- use Neovim for previewing diffs (true) or use an external tool (false)
cmd = { "delta" }, -- example to show a diff with delta
},
git = {
native = false, -- use native (terminal) or Neovim for previewing git diffs and commits
builtin = true, -- use Neovim for previewing git output (true) or use git (false)
args = {}, -- additional arguments passed to the git command. Useful to set pager options usin `-c ...`
},
file = {

13
lua/snacks/picker/config/init.lua
View file

@ -102,10 +102,23 @@ function M.get(opts)
end
end
M.fix_old(opts)
M.multi(opts)
return opts
end
--- Fixes old config options
---@param opts snacks.picker.Config
function M.fix_old(opts)
if opts.previewers.diff.native ~= nil then
opts.previewers.diff.builtin = not opts.previewers.diff.native
end
if opts.previewers.git.native ~= nil then
opts.previewers.git.builtin = not opts.previewers.git.native
end
end
---@param opts snacks.picker.Config
function M.multi(opts)
if not opts.multi then

30
lua/snacks/picker/preview.lua
View file

@ -283,7 +283,7 @@ end
---@param ctx snacks.picker.preview.ctx
function M.git_show(ctx)
local native = ctx.picker.opts.previewers.git.native
local builtin = ctx.picker.opts.previewers.git.builtin
local cmd = {
"git",
"-c",
@ -297,10 +297,10 @@ function M.git_show(ctx)
cmd[#cmd + 1] = "--"
vim.list_extend(cmd, pathspec)
end
if not native then
if builtin then
table.insert(cmd, 2, "--no-pager")
end
M.cmd(cmd, ctx, { ft = not native and "git" or nil })
M.cmd(cmd, ctx, { ft = builtin and "git" or nil })
end
---@param ctx snacks.picker.preview.ctx
@ -313,7 +313,7 @@ end
---@param ctx snacks.picker.preview.ctx
function M.git_log(ctx)
local native = ctx.picker.opts.previewers.git.native
local builtin = ctx.picker.opts.previewers.git.builtin
local cmd = git(
ctx,
"log",
@ -326,14 +326,14 @@ function M.git_log(ctx)
"--no-patch",
ctx.item.commit
)
if not native then
if builtin then
table.insert(cmd, 2, "--no-pager")
end
local row = 0
M.cmd(cmd, ctx, {
ft = not native and "git" or nil,
ft = builtin and "git" or nil,
---@param text string
add = not native and function(text)
add = builtin and function(text)
local commit, msg, date = text:match("^(%S+) (.*) %((.*)%)$")
if commit then
row = row + 1
@ -353,8 +353,8 @@ end
---@param ctx snacks.picker.preview.ctx
function M.diff(ctx)
local native = ctx.picker.opts.previewers.git.native
if ctx.item.diff and native then
local builtin = ctx.picker.opts.previewers.diff.builtin
if builtin then
ctx.item.preview = { text = ctx.item.diff, ft = "diff" }
return M.preview(ctx)
end
@ -370,25 +370,25 @@ end
---@param ctx snacks.picker.preview.ctx
function M.git_diff(ctx)
local native = ctx.picker.opts.previewers.git.native
local builtin = ctx.picker.opts.previewers.git.builtin
local cmd = git(ctx, "diff", "HEAD")
if ctx.item.file then
vim.list_extend(cmd, { "--", ctx.item.file })
end
if not native then
if builtin then
table.insert(cmd, 2, "--no-pager")
end
M.cmd(cmd, ctx, { ft = not native and "diff" or nil })
M.cmd(cmd, ctx, { ft = builtin and "diff" or nil })
end
---@param ctx snacks.picker.preview.ctx
function M.git_stash(ctx)
local native = ctx.picker.opts.previewers.git.native
local builtin = ctx.picker.opts.previewers.git.builtin
local cmd = git(ctx, "stash", "show", "--patch", ctx.item.stash)
if not native then
if builtin then
table.insert(cmd, 2, "--no-pager")
end
M.cmd(cmd, ctx, { ft = not native and "diff" or nil })
M.cmd(cmd, ctx, { ft = builtin and "diff" or nil })
end
---@param ctx snacks.picker.preview.ctx