Skip to content

Improved diff popup with fzf-lua & advanced range selections #1748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Improved diff popup with fzf-lua & advanced range selections #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a66c4c2
Fix: focus popup diff "range to", keep diff tab focused
Aitai May 28, 2025
ce2a5ef
Fix: keep stash and commit diff tab focused
Aitai May 28, 2025
beda809
formatting
Aitai May 29, 2025
be37582
Feat: Improve fzf-lua integration for diffs, add diff selection for c…
Aitai May 29, 2025
0ebd6b1
Feat: Implement path diff with globs, remove redundant code
Aitai May 30, 2025
fe63a49
Improve branch clean function to support detached HEAD
Aitai May 30, 2025
84fa907
Forgot imports
Aitai May 30, 2025
19db0fa
Fix luacheck linting
Aitai May 30, 2025
47c28e1
Simplify diffview.open logic
Aitai May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions lua/neogit/integrations/diffview.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ local function get_local_diff_view(section_name, item_name, opts)
return view
end

---@param section_name string
---@param section_name string | string[]
---@param item_name string|nil
---@param opts table|nil
function M.open(section_name, item_name, opts)
Expand All @@ -109,8 +109,10 @@ function M.open(section_name, item_name, opts)
end

local view
-- selene: allow(if_same_then_else)
if section_name == "recent" or section_name:match("unmerged$") or section_name == "log" then

if type(section_name) == "table" then
view = dv_lib.diffview_open(dv_utils.tbl_pack(unpack(section_name)))
elseif section_name == "recent" or section_name:match("unmerged$") or section_name == "log" then
local range
if type(item_name) == "table" then
range = string.format("%s..%s", item_name[1], item_name[#item_name])
Expand All @@ -122,24 +124,23 @@ function M.open(section_name, item_name, opts)

view = dv_lib.diffview_open(dv_utils.tbl_pack(range))
elseif section_name == "range" then
local range = item_name
view = dv_lib.diffview_open(dv_utils.tbl_pack(range))
local range_str = item_name
view = dv_lib.diffview_open(dv_utils.tbl_pack(range_str))
elseif section_name == "stashes" then
assert(item_name, "No item name for stash!")
local stash_id = item_name:match("stash@{%d+}")
view = dv_lib.diffview_open(dv_utils.tbl_pack(stash_id .. "^!"))
elseif section_name == "commit" then
view = dv_lib.diffview_open(dv_utils.tbl_pack(item_name .. "^!"))
elseif section_name == "conflict" and item_name then
view = dv_lib.diffview_open(dv_utils.tbl_pack("--selected-file=" .. item_name))
elseif (section_name == "conflict" or section_name == "worktree") and not item_name then
view = dv_lib.diffview_open()
elseif section_name ~= nil then
view = get_local_diff_view(section_name, item_name, opts)
elseif section_name == nil and item_name ~= nil then
elseif section_name == "commit" or (section_name == nil and item_name ~= nil) then
view = dv_lib.diffview_open(dv_utils.tbl_pack(item_name .. "^!"))
else
elseif
((section_name == "conflict" or section_name == "worktree") and not item_name)
or (section_name == nil and item_name == nil)
then
view = dv_lib.diffview_open()
else
view = get_local_diff_view(section_name, item_name, opts)
end

if view then
Expand Down
1 change: 0 additions & 1 deletion lua/neogit/lib/git/cli.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,6 @@ local function new_builder(subcommand)
{
"git",
"--no-pager",
"--literal-pathspecs",
"--no-optional-locks",
"-c", "core.preloadindex=true",
"-c", "color.ui=always",
Expand Down
Loading
Loading