diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 0d04e9b..8279ddb 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -59,6 +59,14 @@ highlight Cursor guifg=#F2F0EF guibg=#2C363C guisp=NONE gui=NONE highlight CursorLine guifg=NONE guibg=#E6E1DF guisp=NONE gui=NONE highlight CursorLineNr guifg=#2C363C guibg=NONE guisp=NONE gui=bold highlight Delimiter guifg=#8E817B guibg=NONE guisp=NONE gui=NONE +highlight DiagnosticHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE +highlight DiagnosticInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE +highlight DiagnosticUnderlineError guifg=#A8334C guibg=NONE guisp=NONE gui=undercurl +highlight DiagnosticUnderlineHint guifg=#88507D guibg=NONE guisp=NONE gui=undercurl +highlight DiagnosticUnderlineInfo guifg=#286486 guibg=NONE guisp=NONE gui=undercurl +highlight DiagnosticUnderlineWarn guifg=#944927 guibg=NONE guisp=NONE gui=undercurl +highlight DiagnosticVirtualTextError guifg=#A8334C guibg=#E7DDDE guisp=NONE gui=NONE +highlight DiagnosticVirtualTextWarn guifg=#944927 guibg=#F0E6E4 guisp=NONE gui=NONE highlight DiffAdd guifg=NONE guibg=#D8E7CD guisp=NONE gui=NONE highlight DiffChange guifg=NONE guibg=#C0DAF2 guisp=NONE gui=NONE highlight DiffDelete guifg=NONE guibg=#E7CBCE guisp=NONE gui=NONE @@ -86,14 +94,6 @@ highlight LightspeedOneCharMatch guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold highlight LightspeedPendingChangeOpArea guifg=#88507D guibg=NONE guisp=NONE gui=NONE highlight LightspeedShortcut guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold,underline highlight LineNr guifg=#A79891 guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsDefaultHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsDefaultInformation guifg=#286486 guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsUnderlineError guifg=#A8334C guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineHint guifg=#88507D guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineInformation guifg=#286486 guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineWarning guifg=#944927 guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsVirtualTextError guifg=#A8334C guibg=#E7DDDE guisp=NONE gui=NONE -highlight LspDiagnosticsVirtualTextWarning guifg=#944927 guibg=#F0E6E4 guisp=NONE gui=NONE highlight MoreMsg guifg=#4F6C31 guibg=NONE guisp=NONE gui=bold highlight NeogitHunkHeaderHighlight guifg=#2C363C guibg=#E6E1DF guisp=NONE gui=bold highlight NonText guifg=#C0B0A8 guibg=NONE guisp=NONE gui=NONE @@ -156,6 +156,8 @@ highlight! link CocWarningHighlight LspDiagnosticsUnderlineWarning highlight! link CocWarningSign LspDiagnosticsDefaultWarning highlight! link CocWarningVitualText LspDiagnosticsVirtualTextWarning highlight! link CursorColumn CursorLine +highlight! link DiagnosticError Error +highlight! link DiagnosticWarn WarningMsg highlight! link EndOfBuffer NonText highlight! link ErrorMsg Error highlight! link GitGutterAdd GitSignsAdd @@ -168,8 +170,16 @@ highlight! link LightspeedMaskedChar Conceal highlight! link LightspeedPendingOpArea SneakLabel highlight! link LightspeedUnlabeledMatch Bold highlight! link LspCodeLens LineNr -highlight! link LspDiagnosticsDefaultError Error -highlight! link LspDiagnosticsDefaultWarning WarningMsg +highlight! link LspDiagnosticsDefaultError DiagnosticError +highlight! link LspDiagnosticsDefaultHint DiagnosticHint +highlight! link LspDiagnosticsDefaultInformation DiagnosticInfo +highlight! link LspDiagnosticsDefaultWarning DiagnosticWarn +highlight! link LspDiagnosticsUnderlineError DiagnosticUnderlineError +highlight! link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint +highlight! link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo +highlight! link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn +highlight! link LspDiagnosticsVirtualTextError DiagnosticVirtualTextError +highlight! link LspDiagnosticsVirtualTextWarning DiagnosticVirtualTextWarn highlight! link LspReferenceRead ColorColumn highlight! link LspReferenceText ColorColumn highlight! link LspReferenceWrite ColorColumn diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index 9b2f077..6c31b2d 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -59,6 +59,14 @@ highlight Cursor guifg=#171514 guibg=#C4CACF guisp=NONE gui=NONE highlight CursorLine guifg=NONE guibg=#24211F guisp=NONE gui=NONE highlight CursorLineNr guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold highlight Delimiter guifg=#8E8480 guibg=NONE guisp=NONE gui=NONE +highlight DiagnosticHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE +highlight DiagnosticInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE +highlight DiagnosticUnderlineError guifg=#DE6E7C guibg=NONE guisp=NONE gui=undercurl +highlight DiagnosticUnderlineHint guifg=#B279A7 guibg=NONE guisp=NONE gui=undercurl +highlight DiagnosticUnderlineInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=undercurl +highlight DiagnosticUnderlineWarn guifg=#B77E64 guibg=NONE guisp=NONE gui=undercurl +highlight DiagnosticVirtualTextError guifg=#DE6E7C guibg=#3A2A2C guisp=NONE gui=NONE +highlight DiagnosticVirtualTextWarn guifg=#B77E64 guibg=#362C28 guisp=NONE gui=NONE highlight DiffAdd guifg=NONE guibg=#333C2C guisp=NONE gui=NONE highlight DiffChange guifg=NONE guibg=#2D404E guisp=NONE gui=NONE highlight DiffDelete guifg=NONE guibg=#5B2E33 guisp=NONE gui=NONE @@ -86,14 +94,6 @@ highlight LightspeedOneCharMatch guifg=#1C1918 guibg=#B279A7 guisp=NONE gui=bold highlight LightspeedPendingChangeOpArea guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE highlight LightspeedShortcut guifg=#1C1918 guibg=#B279A7 guisp=NONE gui=bold,underline highlight LineNr guifg=#5A5350 guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsDefaultHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsDefaultInformation guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsUnderlineError guifg=#DE6E7C guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineHint guifg=#B279A7 guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineInformation guifg=#6099C0 guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineWarning guifg=#B77E64 guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsVirtualTextError guifg=#DE6E7C guibg=#3A2A2C guisp=NONE gui=NONE -highlight LspDiagnosticsVirtualTextWarning guifg=#B77E64 guibg=#362C28 guisp=NONE gui=NONE highlight MoreMsg guifg=#819B69 guibg=NONE guisp=NONE gui=bold highlight NeogitHunkHeaderHighlight guifg=#B4BDC3 guibg=#24211F guisp=NONE gui=bold highlight NonText guifg=#524C4A guibg=NONE guisp=NONE gui=NONE @@ -156,6 +156,8 @@ highlight! link CocWarningHighlight LspDiagnosticsUnderlineWarning highlight! link CocWarningSign LspDiagnosticsDefaultWarning highlight! link CocWarningVitualText LspDiagnosticsVirtualTextWarning highlight! link CursorColumn CursorLine +highlight! link DiagnosticError Error +highlight! link DiagnosticWarn WarningMsg highlight! link EndOfBuffer NonText highlight! link ErrorMsg Error highlight! link GitGutterAdd GitSignsAdd @@ -168,8 +170,16 @@ highlight! link LightspeedMaskedChar Conceal highlight! link LightspeedPendingOpArea SneakLabel highlight! link LightspeedUnlabeledMatch Bold highlight! link LspCodeLens LineNr -highlight! link LspDiagnosticsDefaultError Error -highlight! link LspDiagnosticsDefaultWarning WarningMsg +highlight! link LspDiagnosticsDefaultError DiagnosticError +highlight! link LspDiagnosticsDefaultHint DiagnosticHint +highlight! link LspDiagnosticsDefaultInformation DiagnosticInfo +highlight! link LspDiagnosticsDefaultWarning DiagnosticWarn +highlight! link LspDiagnosticsUnderlineError DiagnosticUnderlineError +highlight! link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint +highlight! link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo +highlight! link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn +highlight! link LspDiagnosticsVirtualTextError DiagnosticVirtualTextError +highlight! link LspDiagnosticsVirtualTextWarning DiagnosticVirtualTextWarn highlight! link LspReferenceRead ColorColumn highlight! link LspReferenceText ColorColumn highlight! link LspReferenceWrite ColorColumn diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 786a809..9af105d 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -165,20 +165,33 @@ local theme = lush(function() LspReferenceRead { ColorColumn }, -- used for highlighting "read" references LspReferenceWrite { ColorColumn }, -- used for highlighting "write" references - LspDiagnosticsDefaultError { Error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultWarning { WarningMsg }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultInformation { fg = p.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultHint { fg = p.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticError { Error }, + DiagnosticWarn { WarningMsg }, + DiagnosticInfo { fg = p.water }, + DiagnosticHint { fg = p.blossom }, - LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = p.rose.abs_de(48).li(82) }, -- Used for "Error" diagnostic virtual text - LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = p.wood.de(58).li(86) }, -- Used for "Warning" diagnostic virtual text + DiagnosticVirtualTextError { DiagnosticError, bg = p.rose.abs_de(48).li(82) }, + DiagnosticVirtualTextWarn { DiagnosticWarn, bg = p.wood.de(58).li(86) }, + + DiagnosticUnderlineError { DiagnosticError, gui = "undercurl" }, + DiagnosticUnderlineWarn { DiagnosticWarn, gui = "undercurl" }, + DiagnosticUnderlineInfo { DiagnosticInfo, gui = "undercurl" }, + DiagnosticUnderlineHint { DiagnosticHint, gui = "undercurl" }, + + LspDiagnosticsDefaultError { DiagnosticError }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultWarning { DiagnosticWarn }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultInformation { DiagnosticInfo }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultHint { DiagnosticHint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + + LspDiagnosticsVirtualTextError { DiagnosticVirtualTextError }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextWarning { DiagnosticVirtualTextWarn }, -- Used for "Warning" diagnostic virtual text -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text - LspDiagnosticsUnderlineError { LspDiagnosticsDefaultError, gui = "undercurl" }, -- Used to underline "Error" diagnostics - LspDiagnosticsUnderlineWarning { LspDiagnosticsDefaultWarning, gui = "undercurl" }, -- Used to underline "Warning" diagnostics - LspDiagnosticsUnderlineInformation { LspDiagnosticsDefaultInformation, gui = "undercurl" }, -- Used to underline "Information" diagnostics - LspDiagnosticsUnderlineHint { LspDiagnosticsDefaultHint, gui = "undercurl" }, -- Used to underline "Hint" diagnostics + LspDiagnosticsUnderlineError { DiagnosticUnderlineError }, -- Used to underline "Error" diagnostics + LspDiagnosticsUnderlineWarning { DiagnosticUnderlineWarn }, -- Used to underline "Warning" diagnostics + LspDiagnosticsUnderlineInformation { DiagnosticUnderlineInfo }, -- Used to underline "Information" diagnostics + LspDiagnosticsUnderlineHint { DiagnosticUnderlineHint }, -- Used to underline "Hint" diagnostics -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float diff --git a/lua/zenbones/template/lightline.lua b/lua/zenbones/template/lightline.lua index d683bb5..a178ed4 100644 --- a/lua/zenbones/template/lightline.lua +++ b/lua/zenbones/template/lightline.lua @@ -44,8 +44,8 @@ return function(name, theme, palette, terminal) tabline_right_fg = theme.Normal.fg.hex, tabsel_bg = theme.Normal.bg.hex, tabsel_fg = theme.Normal.fg.hex, - warning_bg = theme.LspDiagnosticsVirtualTextWarning.bg.hex, - warning_fg = theme.LspDiagnosticsVirtualTextWarning.fg.hex, + warning_bg = theme.DiagnosticVirtualTextWarn.bg.hex, + warning_fg = theme.DiagnosticVirtualTextWarn.fg.hex, error_bg = theme.LspDiagnosticsVirtualTextError.bg.hex, error_fg = theme.LspDiagnosticsVirtualTextError.fg.hex, }, diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 5964014..4cbd1c9 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -161,25 +161,38 @@ local theme = lush(function() -- 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 { ColorColumn }, -- used for highlighting "text" references LspReferenceRead { ColorColumn }, -- used for highlighting "read" references LspReferenceWrite { ColorColumn }, -- used for highlighting "write" references - LspDiagnosticsDefaultError { Error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultWarning { WarningMsg }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultInformation { fg = p.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultHint { fg = p.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticError { Error }, + DiagnosticWarn { WarningMsg }, + DiagnosticInfo { fg = p.water }, + DiagnosticHint { fg = p.blossom }, - LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = p.rose.abs_de(48).da(68) }, -- Used for "Error" diagnostic virtual text - LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = p.wood.de(58).da(68) }, -- Used for "Warning" diagnostic virtual text + DiagnosticVirtualTextError { DiagnosticError, bg = p.rose.abs_de(48).da(68) }, + DiagnosticVirtualTextWarn { DiagnosticWarn, bg = p.wood.de(58).da(68) }, + + DiagnosticUnderlineError { DiagnosticError, gui = "undercurl" }, + DiagnosticUnderlineWarn { DiagnosticWarn, gui = "undercurl" }, + DiagnosticUnderlineInfo { DiagnosticInfo, gui = "undercurl" }, + DiagnosticUnderlineHint { DiagnosticHint, gui = "undercurl" }, + + LspDiagnosticsDefaultError { DiagnosticError }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultWarning { DiagnosticWarn }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultInformation { DiagnosticInfo }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultHint { DiagnosticHint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + + LspDiagnosticsVirtualTextError { DiagnosticVirtualTextError }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextWarning { DiagnosticVirtualTextWarn }, -- Used for "Warning" diagnostic virtual text -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text - LspDiagnosticsUnderlineError { LspDiagnosticsDefaultError, gui = "undercurl" }, -- Used to underline "Error" diagnostics - LspDiagnosticsUnderlineWarning { LspDiagnosticsDefaultWarning, gui = "undercurl" }, -- Used to underline "Warning" diagnostics - LspDiagnosticsUnderlineInformation { LspDiagnosticsDefaultInformation, gui = "undercurl" }, -- Used to underline "Information" diagnostics - LspDiagnosticsUnderlineHint { LspDiagnosticsDefaultHint, gui = "undercurl" }, -- Used to underline "Hint" diagnostics + LspDiagnosticsUnderlineError { DiagnosticUnderlineError }, -- Used to underline "Error" diagnostics + LspDiagnosticsUnderlineWarning { DiagnosticUnderlineWarn }, -- Used to underline "Warning" diagnostics + LspDiagnosticsUnderlineInformation { DiagnosticUnderlineInfo }, -- Used to underline "Information" diagnostics + LspDiagnosticsUnderlineHint { DiagnosticUnderlineHint }, -- Used to underline "Hint" diagnostics -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float