From 19c1f171aabc5f23f1699ff505b088ea3442ce4e Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Wed, 5 Jan 2022 12:48:14 +0530 Subject: [PATCH] fixed #156 : highlight added for `GitSignsCurrentLineBlame` Other Changes: - refactor: color renamed `lsp.referenceText` -> `lsp.ref_txt` - `TabLineSel` highlight link with `PmenuSel` --- CHANGELOG.md | 3 +++ lua/github-theme/palette/dark.lua | 2 +- lua/github-theme/palette/dark_default.lua | 2 +- lua/github-theme/palette/dimmed.lua | 2 +- lua/github-theme/palette/light.lua | 2 +- lua/github-theme/palette/light_default.lua | 2 +- lua/github-theme/theme.lua | 15 ++++++++------- lua/github-theme/types/gt.lua | 5 ++++- 8 files changed, 20 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b864633..5b24f100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix #133 - highlights of inactive tabline in lualine plugin - inherit `eof` color from `fg_gutter` #150 - cleanup: _getColor()_ from `util` module +- fix #156 - highlight added for `GitSignsCurrentLineBlame` +- refactor: color renamed `lsp.referenceText` -> `lsp.ref_txt` +- `TabLineSel` highlight link with `PmenuSel` ## [v0.0.3] - 09 Dec 2021 diff --git a/lua/github-theme/palette/dark.lua b/lua/github-theme/palette/dark.lua index 92090160..66fec43b 100644 --- a/lua/github-theme/palette/dark.lua +++ b/lua/github-theme/palette/dark.lua @@ -28,7 +28,7 @@ local dark_pallete = { warning = "#cca700", info = "#75beff", hint = "#eeeeb3", - lsp = {referenceText = "#265459"}, + lsp = {ref_txt = "#265459"}, -- Auto-Complication Colors pmenu = {bg = "#1f2428", sbar = "#32383e"}, diff --git a/lua/github-theme/palette/dark_default.lua b/lua/github-theme/palette/dark_default.lua index 594d94ee..1c8b48bb 100644 --- a/lua/github-theme/palette/dark_default.lua +++ b/lua/github-theme/palette/dark_default.lua @@ -28,7 +28,7 @@ local dark_default_palette = { warning = "#f0883e", info = "#75beff", hint = "#eeeeb3", - lsp = {referenceText = "#164449"}, + lsp = {ref_txt = "#164449"}, -- Auto-Complication Colors pmenu = {bg = "#161b22", sbar = "#31373d"}, diff --git a/lua/github-theme/palette/dimmed.lua b/lua/github-theme/palette/dimmed.lua index 40cf1488..c62cf49b 100644 --- a/lua/github-theme/palette/dimmed.lua +++ b/lua/github-theme/palette/dimmed.lua @@ -28,7 +28,7 @@ local dimmed_palette = { warning = "#cca700", info = "#75beff", hint = "#eeeeb3", - lsp = {referenceText = "#28575d"}, + lsp = {ref_txt = "#28575d"}, -- Auto-Complication Colors pmenu = {bg = "#2d333b", sbar = "#363b44"}, diff --git a/lua/github-theme/palette/light.lua b/lua/github-theme/palette/light.lua index 6fceece6..cb881491 100644 --- a/lua/github-theme/palette/light.lua +++ b/lua/github-theme/palette/light.lua @@ -28,7 +28,7 @@ local light_palette = { warning = "#bf8803", info = "#75beff", hint = "#6c6c6c", - lsp = {referenceText = "#c6eed2"}, + lsp = {ref_txt = "#c6eed2"}, -- Auto-Complication Colors pmenu = {bg = "#f6f8fa", sbar = "#f0f1f3"}, diff --git a/lua/github-theme/palette/light_default.lua b/lua/github-theme/palette/light_default.lua index 74b8b401..5da6c30f 100644 --- a/lua/github-theme/palette/light_default.lua +++ b/lua/github-theme/palette/light_default.lua @@ -28,7 +28,7 @@ local light_default_palette = { warning = "#bf8803", info = "#75beff", hint = "#6c6c6c", - lsp = {referenceText = "#ccf3d5"}, + lsp = {ref_txt = "#ccf3d5"}, -- Auto-Complication Colors pmenu = {bg = "#f6f8fa", sbar = "#e7e9eb"}, diff --git a/lua/github-theme/theme.lua b/lua/github-theme/theme.lua index 1993c05a..61197b57 100644 --- a/lua/github-theme/theme.lua +++ b/lua/github-theme/theme.lua @@ -68,7 +68,7 @@ function M.setup(config) StatusLineNC = {fg = c.fg_nc_statusline, bg = c.bg_nc_statusline}, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. TabLine = {bg = c.bg, fg = c.fg}, -- tab pages line, not active tab page label TabLineFill = {bg = c.bg2}, -- tab pages line, where there are no labels - TabLineSel = {fg = c.pmenu.select, bg = c.blue}, -- tab pages line, active tab page label + TabLineSel = {link = "PmenuSel"}, -- tab pages line, active tab page label Title = {fg = c.syntax.variable, style = "bold"}, -- titles for output from ":set all", ":autocmd" etc. Visual = {bg = c.bg_visual_selection}, -- Visual mode selection VisualNOS = {bg = c.bg_visual_selection}, -- Visual mode selection when vim is "Not Owning the Selection". @@ -146,9 +146,9 @@ function M.setup(config) -- These groups are for the native LSP client. Some other LSP clients may -- use these groups, or use their own. Consult your LSP client's -- documentation. - LspReferenceText = {bg = c.lsp.referenceText}, -- used for highlighting "text" references - LspReferenceRead = {bg = c.lsp.referenceText}, -- used for highlighting "read" references - LspReferenceWrite = {bg = c.lsp.referenceText}, -- used for highlighting "write" references + LspReferenceText = {bg = c.lsp.ref_txt}, -- used for highlighting "text" references + LspReferenceRead = {link = "LspReferenceText"}, -- used for highlighting "read" references + LspReferenceWrite = {link = "LspReferenceText"}, -- used for highlighting "write" references LspDiagnosticsDefaultError = {fg = c.error}, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultWarning = {fg = c.warning}, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultInformation = {fg = c.info}, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) @@ -351,8 +351,8 @@ function M.setup(config) LspTroubleNormal = {fg = c.bright_yellow, bg = c.bg_sidebar}, -- Illuminate - illuminatedWord = {bg = c.lsp.referenceText}, - illuminatedCurWord = {bg = c.lsp.referenceText}, + illuminatedWord = {bg = c.lsp.ref_txt}, + illuminatedCurWord = {bg = c.lsp.ref_txt}, -- diff diffAdded = {link = "DiffAdd"}, @@ -382,6 +382,7 @@ function M.setup(config) GitSignsAdd = {fg = c.git_signs.add}, -- diff mode: Added line |diff.txt| GitSignsChange = {fg = c.git_signs.change}, -- diff mode: Changed line |diff.txt| GitSignsDelete = {fg = c.git_signs.delete}, -- diff mode: Deleted line |diff.txt| + GitSignsCurrentLineBlame = {fg = util.darken(c.syntax.comment, 0.4)}, -- diff mode: Deleted line |diff.txt| -- Telescope TelescopeBorder = {fg = c.border}, @@ -511,7 +512,7 @@ function M.setup(config) CmpItemKindEventDefault = {link = "CmpItemKindFunctionDefault"}, CmpItemKindMethodDefault = {link = "CmpItemKindFunctionDefault"}, - CmpItemKindOperatorDefault = {fg = c.syntax.operator}, + CmpItemKindOperatorDefault = {link = "Operator"}, CmpItemKindEnumMemberDefault = {link = "CmpItemKindOperatorDefault"}, CmpItemKindReferenceDefault = {link = "CmpItemKindOperatorDefault"}, CmpItemKindTypeParameter = {link = "CmpItemKindOperatorDefault"}, diff --git a/lua/github-theme/types/gt.lua b/lua/github-theme/types/gt.lua index dd80db78..4b62ed66 100644 --- a/lua/github-theme/types/gt.lua +++ b/lua/github-theme/types/gt.lua @@ -2,6 +2,9 @@ local gt = {} ---@class gt.HexColor string +---@class gt.LspPalette +---@field ref_txt gt.HexColor + ---@class gt.PMenuPalette ---@field bg gt.HexColor ---@field sbar gt.HexColor @@ -66,7 +69,7 @@ local gt = {} ---@field warning gt.HexColor ---@field info gt.HexColor ---@field hint gt.HexColor ----@field lsp gt.HexColor +---@field lsp gt.LspPalette ---DropDown Menu Colors ---@field pmenu gt.PMenuPalette ---Git Colors