Fix diff-hl faces

[mrcnski]

Before

After

Note

About :inherit fringe, I've been using it without any issues in nimbus-theme for some years. It just makes sure that the background matches the fringe background. Not relevant here, but in nimbus-theme it also makes sure that any other properties (like boldness) get cleared.

[nyxkrage]

Thanks!

[LionyxML]

@nyxkrage / @mrcnski

Fun fact, this PR broke both of my legs.

I even opened a discussion here: dgutov/diff-hl#216. It took me hours to find the culprited.

Diff HL also have a margin-mode, and if you'd like to have it working on Emacs terminal (TUI) or even prefer margin over fringes. It is mandatory that you propertize the background to achieve the "bar effect". Diff hl just stopped working (because my markins were " " blank spaces, I just wanted the background colorized to mimic the "bar" gutter) and as it happens to be, it was there, just invisible.

Fun fact 2.

I was precisely developing a minor mode (https://github.com/LionyxML/flymake-margin) and with it trying to solve the original problem of "merging" hl diff and flymake (both on margin). So I would have the background color showing the git status and the foreground showing a flymake mark.

I think we all had good ideas bumping into each other.

So, hl-diff is beautiful on fringe now, but behaves diferently on TUI :/

Well Idn what to do by now. Having the same user experience on both terminal and gui drives my choices of everything :(

I might ask the hl-diff author to create a face specifically for margin mode, but again, would catppuccin use a transparent background by default?

I might be better of patching all in my config.

[dgutov]

I might ask the hl-diff author to create a face specifically for margin mode, but again, would catppuccin use a transparent background by default?

@LionyxML FWIW, diff-hl has two sets of faces: one for the fringe (default), and another for the margin (in which all faces inherit from the corresponding in the former set). So you should be able to tweak the looks of either separately.

[LionyxML]

@dgutov thanks man!

I managed to revert this in my config and kind of find a "fix" to the "overlap", (making it appear side by side, diff-hl and flymake, both on margin).

As to the Catppuccin implementation, it will only break things if someone (like me) have a pretty customizable diff-hl configuration. Testing with the defaults (the thin line on fringe or chars with margin) it's alright.