Just installed delta, doesn't highlight my diffs -- instead, hides diff markers #1680

garyo · 2024-04-30T13:39:27Z

garyo
Apr 30, 2024

I'm on MacOS 14.4.1, arm64. I just installed delta via homebrew, version 0.17.0. Configured it into my .gitconfig as recommended. But when I do git show HEAD, instead of showing the diffs, it hides the diff markers.
Here's an example (I pipe the output into head -40 so you can see the raw input to delta):

% git show HEAD|head -40
commit 098d838dd5df88dc6b01c0207ce17b1b210c2367
Author: Gary Oberbrunner <garyo@darkstarsystems.com>
Date:   Tue Apr 30 08:33:36 2024 -0400

    Add Colourspace example
    
    Signed-off-by: Gary Oberbrunner <garyo@darkstarsystems.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0862260..9769abd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,9 +11,10 @@ else()
     LANGUAGES CXX) # no CUDA
 endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 add_definitions(-D_HAS_AUTO_PTR_ETC)
 if(APPLE)
   set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
@@ -62,6 +63,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_BINARY_DIR})
 # Conan packages
 find_package(EXPAT)
 find_package(opengl_system REQUIRED)
+find_package(cimg REQUIRED)
+find_package(spdlog REQUIRED)
 
 # Macros
 include(OpenFX)
...more output...

produces this output in my terminal:

I can see it's figured out that it's looking at a commit diff, and it's parsing it correctly (hence the hunk headers), but the diff view is all gray with no diff highlighting.
Later on in the output, it also syntax-highlights the added code as if my theme were dark, even though I have light = true:

In my .gitconfig I have this:

[core]
	pager = delta
[interactive]
	diffFilter = delta --color-only
[delta]
	navigate = true
	light = true

and in my env, $PAGER is less:

% env |egrep -i less\|pager\|delta
LESS=-eij3MqsFXR
PAGER=less

I did have delta installed a long time ago, but I don't think I have any remnants of the old config around...

I also tried just cating the input from a diff into delta, with the same results.

garyo · 2024-04-30T13:49:35Z

garyo
Apr 30, 2024
Author

Here's my delta --show-config:

% delta --show-config
    commit-style                  = raw
    file-style                    = blue
    hunk-header-style             = syntax
    minus-style                   = normal "#ffe0e0"
    minus-non-emph-style          = normal "#ffe0e0"
    minus-emph-style              = normal "#ffc0c0"
    minus-empty-line-marker-style = normal "#ffe0e0"
    zero-style                    = syntax
    plus-style                    = syntax "#d0ffd0"
    plus-non-emph-style           = syntax "#d0ffd0"
    plus-emph-style               = syntax "#a0efa0"
    plus-empty-line-marker-style  = normal "#d0ffd0"
    grep-file-style               = purple
    grep-line-number-style        = green
    whitespace-error-style        = reverse purple
    blame-palette                 = #FFFFFF #DDDDDD #BBBBBB
    true-color                    = true
    file-added-label              = 'added:'
    file-modified-label           = Δ
    file-removed-label            = 'removed:'
    file-renamed-label            = 'renamed:'
    right-arrow                   = '⟶  '
    hyperlinks                    = false
    inspect-raw-lines             = true
    keep-plus-minus-markers       = false
    line-numbers                  = false
    max-line-distance             = 0.6
    max-line-length               = 512
    diff-stat-align-width         = 48
    line-fill-method              = ansi
    navigate                      = true
    navigate-regex                = '^(commit|added:|removed:|renamed:|Δ|•)'
    pager                         = none
    paging                        = auto
    side-by-side                  = false
    syntax-theme                  = GitHub
    width                         = 172
    tabs                          = 8
    word-diff-regex               = '\w+'

0 replies

garyo · 2024-04-30T13:57:58Z

garyo
Apr 30, 2024
Author

Also, adding --diff-highlight makes it color somewhat better (though with no syntax highlighting for C++):

0 replies

dandavison · 2024-04-30T17:31:21Z

dandavison
Apr 30, 2024
Maintainer

Hi @garyo, delta uses the file name suffix to infer language, so CMakeLists.txt will not be syntax-highlighted because it maps to plain text.

Hm, I wonder why you're not getting the correct colors for *.cpp. In addition to not being appropriate for a light background, it looks like the syntax highlighting is "broken" in the sense that I only see a pale yellow and a blackish color, when we would expect more colors for the different syntactic visible in that fragment. What terminal are you using, and are you using tmux/screem? My first thought is that it's not handling the ANSI color escapes correctly. Could you try --true-color=never and maybe try another terminal emulator, and without screen/tmux if you use those?

diff-highlight doesn't syntax highlight by design.

0 replies

garyo · 2024-04-30T21:34:31Z

garyo
Apr 30, 2024
Author

In case you're interested in the generated ANSI escapes, here's a segment from the top of the working version (--true-color=never) with the ANSI escapes expanded:

% git show HEAD | delta --true-color=never | cat -ve |head -30
Author: Gary Oberbrunner <garyo@darkstarsystems.com>$
Date:   Tue Apr 30 08:33:36 2024 -0400$
$
    Add Colourspace example$
    $
    Signed-off-by: Gary Oberbrunner <garyo@darkstarsystems.com>$
$
$
^[[34m<CE>M-^T CMakeLists.txt^[[0m$
^[[34m<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@^[[0m$
$
^[[34m<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@^[[0m^[[34m<E2>M-^TM-^P^[[0m$
^[[34m<E2>M-^@<A2>^[[0m ^[[34m11^[[0m:^[[38;5;236m else() ^[[0m^[[34m<E2>M-^TM-^B^[[0m$
^[[34m<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@<E2>M-^TM-^@^[[0m^[[34m<E2>M-^TM-^X^[[0m$
^[[38;5;236m    LANGUAGES CXX) # no CUDA^[[0m$
^[[38;5;236mendif()^[[0m$
^[[38;5;236mset_property(GLOBAL PROPERTY USE_FOLDERS ON)^[[0m$
^[[48;5;224mset(CMAKE_CXX_STANDARD ^[[48;5;217m14^[[48;5;224m)^[[0m^[[48;5;224m^[[0K^[[0m$
^[[48;5;194;38;5;236mset(CMAKE_CXX_STANDARD ^[[48;5;157m17^[[48;5;194m)^[[0m^[[48;5;194m^[[0K^[[0m$
^[[38;5;236mset(CMAKE_CXX_STANDARD_REQUIRED ON)^[[0m$
^[[38;5;236mset(CMAKE_STATIC_LIBRARY_PREFIX "lib")^[[0m$
^[[48;5;194;38;5;236mset(CMAKE_EXPORT_COMPILE_COMMANDS ON)^[[0m^[[48;5;194m^[[0K^[[0m$
^[[38;5;236madd_definitions(-D_HAS_AUTO_PTR_ETC)^[[0m$
^[[38;5;236mif(APPLE)^[[0m$
^[[38;5;236m  set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")^[[0m$
$

and here is --true-color=always:

% git show HEAD | delta --true-color=always | cat -ve |head -30      
commit 098d838dd5df88dc6b01c0207ce17b1b210c2367$
Author: Gary Oberbrunner <garyo@darkstarsystems.com>$
Date:   Tue Apr 30 08:33:36 2024 -0400$
$
    Add Colourspace example$
    $
    Signed-off-by: Gary Oberbrunner <garyo@darkstarsystems.com>$
$
$
^[[34m?M-^T CMakeLists.txt^[[0m$
^[[34m?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@^[[0m$
$
^[[34m?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@^[[0m^[[34m?M-^TM-^P^[[0m$
^[[34m?M-^@?^[[0m ^[[34m11^[[0m:^[[38;2;51;51;51m else() ^[[0m^[[34m?M-^TM-^B^[[0m$
^[[34m?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@?M-^TM-^@^[[0m^[[34m?M-^TM-^X^[[0m$
^[[38;2;51;51;51m    LANGUAGES CXX) # no CUDA^[[0m$
^[[38;2;51;51;51mendif()^[[0m$
^[[38;2;51;51;51mset_property(GLOBAL PROPERTY USE_FOLDERS ON)^[[0m$
^[[48;2;255;224;224mset(CMAKE_CXX_STANDARD ^[[48;2;255;192;192m14^[[48;2;255;224;224m)^[[0m^[[48;2;255;224;224m^[[0K^[[0m$
^[[48;2;208;255;208;38;2;51;51;51mset(CMAKE_CXX_STANDARD ^[[48;2;160;239;160m17^[[48;2;208;255;208m)^[[0m^[[48;2;208;255;208m^[[0K^[[0m$
^[[38;2;51;51;51mset(CMAKE_CXX_STANDARD_REQUIRED ON)^[[0m$
^[[38;2;51;51;51mset(CMAKE_STATIC_LIBRARY_PREFIX "lib")^[[0m$
^[[48;2;208;255;208;38;2;51;51;51mset(CMAKE_EXPORT_COMPILE_COMMANDS ON)^[[0m^[[48;2;208;255;208m^[[0K^[[0m$
^[[38;2;51;51;51madd_definitions(-D_HAS_AUTO_PTR_ETC)^[[0m$
^[[38;2;51;51;51mif(APPLE)^[[0m$
^[[38;2;51;51;51m  set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")^[[0m$
$

3 replies

garyo Apr 30, 2024
Author

And with some further terminal testing and googling, you are indeed right -- Mac Terminal sadly does not support True Color! See this link for instance.

dandavison Apr 30, 2024
Maintainer

OK excellent. I hope it's either looking decent with --true-color=never or you're happy to use a different terminal.

garyo May 1, 2024
Author

Yes, looks OK. This is diff, and I do see syntax highlighting in C++ as well:

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Just installed delta, doesn't highlight my diffs -- instead, hides diff markers #1680

{{title}}

Replies: 4 comments 3 replies

{{title}}

{{title}}

{{title}}

{{editor}}'s edit

{{editor}}'s edit

{{title}}

{{title}}

{{title}}

{{title}}

Select a reply

Just installed delta, doesn't highlight my diffs -- instead, hides diff markers #1680

garyo Apr 30, 2024

Replies: 4 comments · 3 replies

garyo Apr 30, 2024 Author

garyo Apr 30, 2024 Author

dandavison Apr 30, 2024 Maintainer

garyo Apr 30, 2024 Author

garyo Apr 30, 2024 Author

dandavison Apr 30, 2024 Maintainer

garyo May 1, 2024 Author

garyo
Apr 30, 2024

Replies: 4 comments 3 replies

garyo
Apr 30, 2024
Author

garyo
Apr 30, 2024
Author

dandavison
Apr 30, 2024
Maintainer

garyo
Apr 30, 2024
Author

garyo Apr 30, 2024
Author

dandavison Apr 30, 2024
Maintainer

garyo May 1, 2024
Author