git_diff previewer loses syntax highlighting when viewing individual commits via git_commits() cmd

[zachyarbrough]

Hello all, this is my first time really engaging in GitHub discussions/open source so bear with me if my formatting and approach is incorrect.

Issue

I have been loving the integration fzf-lua has with git and have basically been using it as my workhorse for viewing everything git related. I recently created a keymap for viewing git_commits().

Playing around with git_commits I noticed that the syntax highlighting works perfectly fine in the initial window (viewing all changes in one preview for each commit). However, when I <C-d> into an individual commit to view each file's changes the diff syntax seems to disappear.

My current keymap looks like this:

vim.keymap.set('n', '<leader>gc', function()
    fzf().git_commits({
        winopts = {
            fullscreen = true,
            preview = {
                layout = 'vertical',
                vertical = 'up:70%'
            }
        }
    })
end, { desc = 'View git commits' })

Here are screenshots of what I am referencing:
Initial view of all commits with highlighting in the preview

Pressing <C-d> to view an individual commit and see that the highlight is gone

NOTE: I am not currently using any additional syntax highlighting plugins like delta

Maybe I am missing something easy like a setting that enables color for all git_diff previews, but I have been stuck trying to figure this out for a minute and can't seem to find the root cause. Any suggestions would be appreciated!

I'd be happy to drill more into the root issue and potentially submit a PR if this is confirmed a bug.

[ibhagwan]

Do you have syntax highlighting when you run :FzfLua git_diff ref=HEAD~?

If not, might just be as simple as adding --color=always to the diff command.

Let me know and we can adjust the defaults accordingly.

[zachyarbrough]

Wow that was it, thanks for the insanely quick response!

Running :FzfLua git_diff ref=HEAD~ did not show any diff colors, when I ran git config --global color.ui always that fixed it for all the windows in git_commits().

Let me know and we can adjust the defaults accordingly.

Just to clarify, did you mean adjust the default in the codebase for everyone so it works like this out of the box, or were you suggesting I modify it in my local config?

If you are fine with me adjusting the default to --color=always, I would love to dive into the codebase and create a PR for that. I am still quite new to open-source development but this seems like a relatively simple fix.

[ibhagwan]

Wow that was it, thanks for the insanely quick response!

Running :FzfLua git_diff ref=HEAD~ did not show any diff colors, when I ran git config --global color.ui always that fixed it for all the windows in git_commits().

Let me know and we can adjust the defaults accordingly.

Just to clarify, did you mean adjust the default in the codebase for everyone so it works like this out of the box, or were you suggesting I modify it in my local config?

If you are fine with me adjusting the default to --color=always, I would love to dive into the codebase and create a PR for that. I am still quite new to open-source development but this seems like a relatively simple fix.

I meant we can add color so it works for everyone, most are probably using delta so it wasn’t noticeable, if you wish to PR, here’s where it would be added:

fzf-lua/lua/fzf-lua/defaults.lua

Lines 678 to 682 in 988416c

	diff = {
	cmd = "git --no-pager diff --name-only {ref1} {ref}",
	ref = nil,
	ref1 = nil,
	preview = "git diff {ref1} {ref} {file}",

[zachyarbrough]

Awesome! I will look into it and create the PR!

[ibhagwan]

Awesome! I will look into it and create the PR!

Tysm, looking forward to your contribution.