Skip to content

Commit

Permalink
fixed #156 : highlight added for GitSignsCurrentLineBlame
Browse files Browse the repository at this point in the history
Other Changes:
- refactor: color renamed `lsp.referenceText` -> `lsp.ref_txt`
- `TabLineSel` highlight link with `PmenuSel`
  • Loading branch information
ful1e5 committed Jan 5, 2022
1 parent 3e22cc8 commit 19c1f17
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 13 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lua/github-theme/palette/dark.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
2 changes: 1 addition & 1 deletion lua/github-theme/palette/dark_default.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
2 changes: 1 addition & 1 deletion lua/github-theme/palette/dimmed.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
2 changes: 1 addition & 1 deletion lua/github-theme/palette/light.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
2 changes: 1 addition & 1 deletion lua/github-theme/palette/light_default.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
15 changes: 8 additions & 7 deletions lua/github-theme/theme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"},
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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"},
Expand Down
5 changes: 4 additions & 1 deletion lua/github-theme/types/gt.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 19c1f17

Please sign in to comment.