summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraktersnurra <gustaf.rydholm@gmail.com>2022-10-29 19:20:48 +0200
committerGitHub <noreply@github.com>2022-10-29 19:20:48 +0200
commitd2c92863069b45d4264fb9dfc167cda07d2c7f6d (patch)
treebe57d453a35e0363f7c3f70c1416e266fd52a482
parent2951af7bbd839ebef25e33f8bd01bd5c501f76c8 (diff)
Update lsp groups (#13)
-rw-r--r--lua/no-clown-fiesta/highlight-group/lsp.lua56
-rw-r--r--lua/no-clown-fiesta/highlight-group/neogit.lua2
-rw-r--r--lua/no-clown-fiesta/highlight-group/nvim-tree.lua14
-rw-r--r--lua/no-clown-fiesta/highlight-group/telescope.lua2
-rw-r--r--lua/no-clown-fiesta/highlight-group/treesitter.lua4
-rw-r--r--lua/no-clown-fiesta/highlights.lua10
-rw-r--r--lua/no-clown-fiesta/palette.lua8
7 files changed, 38 insertions, 58 deletions
diff --git a/lua/no-clown-fiesta/highlight-group/lsp.lua b/lua/no-clown-fiesta/highlight-group/lsp.lua
index 5ebfc34..9c14700 100644
--- a/lua/no-clown-fiesta/highlight-group/lsp.lua
+++ b/lua/no-clown-fiesta/highlight-group/lsp.lua
@@ -2,47 +2,27 @@ local M = {}
function M.highlight(palette)
return {
- LspDiagnosticsDefaultError = { fg = palette.error_red },
- LspDiagnosticsDefaultWarning = { fg = palette.warning_orange },
- LspDiagnosticsDefaultInformation = { fg = palette.info_yellow },
- LspDiagnosticsDefaultInfo = { fg = palette.info_yellow },
- LspDiagnosticsDefaultHint = { fg = palette.hint_blue },
- LspDiagnosticsVirtualTextError = { fg = palette.error_red },
- LspDiagnosticsVirtualTextWarning = { fg = palette.warning_orange },
- LspDiagnosticsVirtualTextInformation = { fg = palette.info_yellow },
- LspDiagnosticsVirtualTextInfo = { fg = palette.info_yellow },
- LspDiagnosticsVirtualTextHint = { fg = palette.hint_blue },
- LspDiagnosticsFloatingError = { fg = palette.error_red },
- LspDiagnosticsFloatingWarning = { fg = palette.warning_orange },
- LspDiagnosticsFloatingInformation = { fg = palette.info_yellow },
- LspDiagnosticsFloatingInfo = { fg = palette.info_yellow },
- LspDiagnosticsFloatingHint = { fg = palette.hint_blue },
- DiagnosticSignError = { fg = palette.error_red },
- DiagnosticSignWarning = { fg = palette.warning_orange },
- DiagnosticSignWarn = { fg = palette.gray },
- DiagnosticSignInformation = { fg = palette.info_yellow },
- DiagnosticSignInfo = { fg = palette.gray },
- DiagnosticSignHint = { fg = palette.gray },
- LspDiagnosticsSignError = { fg = palette.error_red },
- LspDiagnosticsSignWarning = { fg = palette.warning_orange },
- LspDiagnosticsSignInformation = { fg = palette.info_yellow },
- LspDiagnosticsSignInfo = { fg = palette.info_yellow },
- LspDiagnosticsSignHint = { fg = palette.hint_blue },
- LspDiagnosticsError = { fg = palette.error_red },
- LspDiagnosticsWarning = { fg = palette.warning_orange },
- LspDiagnosticsInformation = { fg = palette.info_yellow },
- LspDiagnosticsInfo = { fg = palette.info_yellow },
- LspDiagnosticsHint = { fg = palette.hint_blue },
- DiagnosticUnderlineError = {
- sp = palette.error_red,
- undercurl = true,
- },
- DiagnosticUnderlineWarn = { sp = palette.warning_orange },
- DiagnosticUnderlineInfo = { sp = palette.hint_blue },
- DiagnosticUnderlineHint = { sp = palette.hint_blue },
LspReferenceRead = { bg = "#36383F" },
LspReferenceText = { bg = "#36383F" },
LspReferenceWrite = { bg = "#36383f" },
+
+ DiagnosticError = { fg = palette.error }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+ DiagnosticWarn = { fg = palette.warning }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+ DiagnosticInfo = { fg = palette.info }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+ DiagnosticHint = { fg = palette.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+
+ DiagnosticVirtualTextError = { fg = palette.error }, -- Used for "Error" diagnostic virtual text
+ DiagnosticVirtualTextWarn = { fg = palette.warning }, -- Used for "Warning" diagnostic virtual text
+ DiagnosticVirtualTextInfo = { fg = palette.info }, -- Used for "Information" diagnostic virtual text
+ DiagnosticVirtualTextHint = { fg = palette.hint }, -- Used for "Hint" diagnostic virtual text
+
+ DiagnosticUnderlineError = { undercurl = true, sp = palette.error }, -- Used to underline "Error" diagnostics
+ DiagnosticUnderlineWarn = { undercurl = true, sp = palette.warning }, -- Used to underline "Warning" diagnostics
+ DiagnosticUnderlineInfo = { undercurl = true, sp = palette.info }, -- Used to underline "Information" diagnostics
+ DiagnosticUnderlineHint = { undercurl = true, sp = palette.hint }, -- Used to underline "Hint" diagnostics
+
+ LspSignatureActiveParameter = { bg = palette.alt_bg, bold = true },
+ LspCodeLens = { fg = palette.comment },
}
end
diff --git a/lua/no-clown-fiesta/highlight-group/neogit.lua b/lua/no-clown-fiesta/highlight-group/neogit.lua
index 40917c1..14d9fb1 100644
--- a/lua/no-clown-fiesta/highlight-group/neogit.lua
+++ b/lua/no-clown-fiesta/highlight-group/neogit.lua
@@ -3,7 +3,7 @@ local M = {}
function M.highlight(palette)
return {
NeogitNotificationInfo = { fg = palette.sign_add },
- NeogitNotificationWarning = { fg = palette.warning_orange },
+ NeogitNotificationWarning = { fg = palette.warning },
NeogitNotificationError = { fg = palette.sign_delete },
NeogitDiffAddHighlight = {
fg = palette.sign_add,
diff --git a/lua/no-clown-fiesta/highlight-group/nvim-tree.lua b/lua/no-clown-fiesta/highlight-group/nvim-tree.lua
index 21cdc25..c110435 100644
--- a/lua/no-clown-fiesta/highlight-group/nvim-tree.lua
+++ b/lua/no-clown-fiesta/highlight-group/nvim-tree.lua
@@ -19,19 +19,19 @@ function M.highlight(palette)
NvimTreeGitNew = { fg = palette.cyan },
NvimTreeGitRenamed = { fg = palette.cyan },
NvimTreeGitDeleted = { fg = palette.sign_delete },
- NvimTreeGitMerge = { fg = palette.info_yellow },
- NvimTreeGitDirty = { fg = palette.info_yellow },
+ NvimTreeGitMerge = { fg = palette.info },
+ NvimTreeGitDirty = { fg = palette.info },
NvimTreeSymlink = { fg = palette.cyan },
NvimTreeRootFolder = { fg = palette.fg, bold = true },
NvimTreeExecFile = { fg = palette.green },
NvimTreeStatusLine = { fg = palette.alt_bg, bg = palette.alt_bg },
NvimTreeStatusLineNC = { fg = palette.alt_bg, bg = palette.alt_bg },
NvimTreeStatusNC = { fg = palette.alt_bg, bg = palette.alt_bg },
- NvimTreeLspDiagnosticsErr = { fg = palette.error_red },
- NvimTreeLspDiagnosticsError = { fg = palette.error_red },
- NvimTreeLspDiagnosticsHint = { fg = palette.hint_blue },
- NvimTreeLspDiagnosticsInformation = { fg = palette.info_yellow },
- NvimTreeLspDiagnosticsWarning = { fg = palette.warning_orange },
+ NvimTreeLspDiagnosticsErr = { fg = palette.error },
+ NvimTreeLspDiagnosticsError = { fg = palette.error },
+ NvimTreeLspDiagnosticsHint = { fg = palette.hint },
+ NvimTreeLspDiagnosticsInformation = { fg = palette.info },
+ NvimTreeLspDiagnosticsWarning = { fg = palette.warning },
}
end
diff --git a/lua/no-clown-fiesta/highlight-group/telescope.lua b/lua/no-clown-fiesta/highlight-group/telescope.lua
index 1a0971c..24e573c 100644
--- a/lua/no-clown-fiesta/highlight-group/telescope.lua
+++ b/lua/no-clown-fiesta/highlight-group/telescope.lua
@@ -4,7 +4,7 @@ function M.highlight(palette)
return {
TelescopeNormal = { fg = palette.fg, bg = palette.bg },
TelescopeSelection = { fg = palette.fg, bg = palette.accent },
- TelescopeMatching = { fg = palette.info_yellow, bold = true },
+ TelescopeMatching = { fg = palette.info, bold = true },
TelescopeBorder = { fg = palette.fg, bg = palette.bg },
}
end
diff --git a/lua/no-clown-fiesta/highlight-group/treesitter.lua b/lua/no-clown-fiesta/highlight-group/treesitter.lua
index fb3d1c1..6217cb7 100644
--- a/lua/no-clown-fiesta/highlight-group/treesitter.lua
+++ b/lua/no-clown-fiesta/highlight-group/treesitter.lua
@@ -36,7 +36,7 @@ function M.highlight(palette, options)
["@number"] = { fg = palette.red },
["@boolean"] = { fg = palette.red },
["@character"] = { fg = palette.light_green },
- ["@error"] = { fg = palette.error_red },
+ ["@error"] = { fg = palette.error },
["@function"] = vim.tbl_extend(
"force",
{ fg = palette.cyan },
@@ -75,7 +75,7 @@ function M.highlight(palette, options)
["@keyword.operator"] = { fg = palette.gray_blue },
["@structure"] = { fg = palette.purple_test },
["@strong"] = { fg = palette.medium_gray },
- ["@query.linter.error"] = { fg = palette.warning_orange },
+ ["@query.linter.error"] = { fg = palette.warning },
}
end
diff --git a/lua/no-clown-fiesta/highlights.lua b/lua/no-clown-fiesta/highlights.lua
index 86446fc..844b56b 100644
--- a/lua/no-clown-fiesta/highlights.lua
+++ b/lua/no-clown-fiesta/highlights.lua
@@ -10,7 +10,7 @@ function M.highlight(palette, options)
MsgArea = { fg = palette.fg, bg = palette.bg },
ModeMsg = { fg = palette.fg, bg = palette.bg },
MsgSeparator = { fg = palette.fg, bg = palette.bg },
- SpellBad = { sp = palette.error_red, undercurl = true },
+ SpellBad = { sp = palette.error, undercurl = true },
SpellCap = { sp = palette.yellow, undercurl = true },
SpellLocal = { sp = palette.green, undercurl = true },
SpellRare = { sp = palette.purple, undercurl = true },
@@ -36,7 +36,7 @@ function M.highlight(palette, options)
NormalFloat = { bg = palette.alt_bg },
Visual = { bg = palette.gray },
VisualNOS = { bg = palette.alt_bg },
- WarningMsg = { fg = palette.error_red, bg = palette.bg },
+ WarningMsg = { fg = palette.error, bg = palette.bg },
DiffAdd = { bg = palette.neogit_green },
DiffText = { bg = palette.neogit_blue },
DiffChange = {
@@ -59,7 +59,7 @@ function M.highlight(palette, options)
Directory = { fg = palette.blue },
SpecialKey = { fg = palette.blue },
Title = { fg = palette.blue },
- ErrorMsg = { fg = palette.error_red, bg = palette.bg, bold = true },
+ ErrorMsg = { fg = palette.error, bg = palette.bg, bold = true },
Search = { fg = palette.orange, bg = palette.alt_bg },
IncSearch = { fg = palette.cursor_fg, bg = palette.alt_bg },
Substitute = { fg = palette.alt_bg, bg = palette.gray_blue },
@@ -115,12 +115,12 @@ function M.highlight(palette, options)
Italic = { italic = true },
Ignore = { fg = palette.cyan, bg = palette.bg, bold = true },
Todo = { fg = palette.red, bg = palette.bg, bold = true },
- Error = { fg = palette.error_red, bg = palette.bg, bold = true },
+ Error = { fg = palette.error, bg = palette.bg, bold = true },
TabLine = { fg = palette.gray, bg = palette.alt_bg },
TabLineSel = { fg = palette.white, bg = palette.alt_bg },
TabLineFill = { fg = palette.white, bg = palette.alt_bg },
WinSeparator = { fg = palette.medium_gray, bg = palette.bg },
- DiagnosticFloatingError = { fg = palette.error_red },
+ DiagnosticFloatingError = { fg = palette.error },
}
end
diff --git a/lua/no-clown-fiesta/palette.lua b/lua/no-clown-fiesta/palette.lua
index 246785e..11e7745 100644
--- a/lua/no-clown-fiesta/palette.lua
+++ b/lua/no-clown-fiesta/palette.lua
@@ -25,10 +25,10 @@ local colors = {
sign_add = "#90A959",
sign_change = "#82a8c8",
sign_delete = "#AC4142",
- error_red = "#AC4142",
- warning_orange = "#F4BF75",
- info_yellow = "#F4BF75",
- hint_blue = "#A5D6FF",
+ error = "#AC4142",
+ warning = "#F4BF75",
+ info = "#F4BF75",
+ hint = "#A5D6FF",
hint_green = "#90A959",
neogit_light_green = "#4f5c32",
neogit_blue = "#33424f",