Skip to content
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.

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

feat(gitsigns): support GitSignsCurrentLineBlame highlights #567

Conversation

kang8
Copy link
Contributor

@kang8 kang8 commented Aug 20, 2023

Description

I found that the fg color of GitSignsCurrentLineBlame and Comment are the same, which sometimes confuses me:

The Comment fg color is overlay0 now:
image

Comment = { fg = C.overlay0, style = O.styles.comments }, -- just comments

GitSignsCurrentLineBlame is mapped to NonText:

https://github.com/lewis6991/gitsigns.nvim/blob/749267aaa863c30d721c9913699c5d94e0c07dd3/lua/gitsigns/highlight.lua#L174

And, NonText fg color is same with Comment:

NonText = { fg = C.overlay0 }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.

What problem does this PR solve?

This PR distinguishes the two, making the GitSignsCurrentLineBlame dimmer and making it easier to distinguish between the two.

Actual effect

Latte

  • before
image
  • after
image

Frappe

  • before
image
  • after
image

Macchiato

  • before
image
  • after
image

Mocha

  • before
image
  • after
image

@mrtnvgr mrtnvgr changed the title feat(gitsigns): Support GitSignsCurrentLineBlame highlights feat(gitsigns): support GitSignsCurrentLineBlame highlights Aug 20, 2023
@mrtnvgr mrtnvgr merged commit 3fdd394 into catppuccin:main Aug 20, 2023
10 checks passed
@kang8 kang8 deleted the feature/gitsign-support-gitsignscurrentlineblame-highlights branch August 20, 2023 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants