fix: Reverse hl groups and adjust shade - Githubissues

akinsho / git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim

1k stars 35 forks source link

fix: Reverse hl groups and adjust shade #20

Closed thomashoggard closed 2 years ago

thomashoggard commented 2 years ago

Resolves: https://github.com/akinsho/git-conflict.nvim/issues/19

Description

The highlight groups were reversed, I adjusted them so they were set to the proper colors
WIth the hl groups reversed, DiffAdd and DiffText represented the bg for the code and not labels. The labels are brighter than the code in vscode so I flipped the "dimming" -10 value for a brighting "60".

Screens

Before	After	vscode

Notes

I tested by setting the following DiffAdd and DiffText hl values.

vim.api.nvim_set_hl(0, 'DiffText', { fg = "#ffffff", bg = "#1d3b40" })
vim.api.nvim_set_hl(0, 'DiffAdd', { fg = "#ffffff", bg = "#1d3450" })

akinsho commented 2 years ago

@thomashoggard thanks for the PR looks great 👍🏿