diff options
164 files changed, 13205 insertions, 4401 deletions
@@ -6,3 +6,5 @@ templates/* !/templates/config.yaml !/templates/default.mustache + +.venv diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim index 1457552..5cf93e5 100644 --- a/colors/base16-3024.vim +++ b/colors/base16-3024.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim index fa25ce9..988b5a7 100644 --- a/colors/base16-apathy.vim +++ b/colors/base16-apathy.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim index c82b83f..c5085a6 100644 --- a/colors/base16-ashes.vim +++ b/colors/base16-ashes.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim index 2c15341..0d7bd3d 100644 --- a/colors/base16-atelier-cave-light.vim +++ b/colors/base16-atelier-cave-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim index e3fcdb6..685e1d7 100644 --- a/colors/base16-atelier-cave.vim +++ b/colors/base16-atelier-cave.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim index ea8f2a6..e2057c8 100644 --- a/colors/base16-atelier-dune-light.vim +++ b/colors/base16-atelier-dune-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim index 0eabaa9..8d5e89f 100644 --- a/colors/base16-atelier-dune.vim +++ b/colors/base16-atelier-dune.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim index c893d82..6e4529a 100644 --- a/colors/base16-atelier-estuary-light.vim +++ b/colors/base16-atelier-estuary-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim index 1d05916..05f97ba 100644 --- a/colors/base16-atelier-estuary.vim +++ b/colors/base16-atelier-estuary.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim index 364886b..410e683 100644 --- a/colors/base16-atelier-forest-light.vim +++ b/colors/base16-atelier-forest-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim index 9b25f18..b60642b 100644 --- a/colors/base16-atelier-forest.vim +++ b/colors/base16-atelier-forest.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim index 7067d12..6aaab02 100644 --- a/colors/base16-atelier-heath-light.vim +++ b/colors/base16-atelier-heath-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim index 2c3897c..3fa0b7e 100644 --- a/colors/base16-atelier-heath.vim +++ b/colors/base16-atelier-heath.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim index 10722b5..7227df9 100644 --- a/colors/base16-atelier-lakeside-light.vim +++ b/colors/base16-atelier-lakeside-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim index 2fb78eb..5773c2a 100644 --- a/colors/base16-atelier-lakeside.vim +++ b/colors/base16-atelier-lakeside.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim index 23f734a..aa7ac34 100644 --- a/colors/base16-atelier-plateau-light.vim +++ b/colors/base16-atelier-plateau-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim index 47252d9..5fb721f 100644 --- a/colors/base16-atelier-plateau.vim +++ b/colors/base16-atelier-plateau.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim index ece698e..f9189cc 100644 --- a/colors/base16-atelier-savanna-light.vim +++ b/colors/base16-atelier-savanna-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim index 593c51c..f0a4950 100644 --- a/colors/base16-atelier-savanna.vim +++ b/colors/base16-atelier-savanna.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim index 2ea82e4..cdb713f 100644 --- a/colors/base16-atelier-seaside-light.vim +++ b/colors/base16-atelier-seaside-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim index 2c516e0..9657799 100644 --- a/colors/base16-atelier-seaside.vim +++ b/colors/base16-atelier-seaside.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim index d1bb77d..d8fb62d 100644 --- a/colors/base16-atelier-sulphurpool-light.vim +++ b/colors/base16-atelier-sulphurpool-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim index df5fdbe..d576020 100644 --- a/colors/base16-atelier-sulphurpool.vim +++ b/colors/base16-atelier-sulphurpool.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-atlas.vim b/colors/base16-atlas.vim index 91c21ce..9dc7fe2 100644 --- a/colors/base16-atlas.vim +++ b/colors/base16-atlas.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim index 088e0e9..8d67fc6 100644 --- a/colors/base16-bespin.vim +++ b/colors/base16-bespin.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-bathory.vim b/colors/base16-black-metal-bathory.vim index 5cd672e..dce5dc6 100644 --- a/colors/base16-black-metal-bathory.vim +++ b/colors/base16-black-metal-bathory.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-burzum.vim b/colors/base16-black-metal-burzum.vim index 6e0815d..4da1282 100644 --- a/colors/base16-black-metal-burzum.vim +++ b/colors/base16-black-metal-burzum.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-dark-funeral.vim b/colors/base16-black-metal-dark-funeral.vim index b9baf83..f23c292 100644 --- a/colors/base16-black-metal-dark-funeral.vim +++ b/colors/base16-black-metal-dark-funeral.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-gorgoroth.vim b/colors/base16-black-metal-gorgoroth.vim index d71cd45..a040c80 100644 --- a/colors/base16-black-metal-gorgoroth.vim +++ b/colors/base16-black-metal-gorgoroth.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-immortal.vim b/colors/base16-black-metal-immortal.vim index 2234b35..f12c556 100644 --- a/colors/base16-black-metal-immortal.vim +++ b/colors/base16-black-metal-immortal.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-khold.vim b/colors/base16-black-metal-khold.vim index 734ad95..928a757 100644 --- a/colors/base16-black-metal-khold.vim +++ b/colors/base16-black-metal-khold.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-marduk.vim b/colors/base16-black-metal-marduk.vim index ac2945e..64da0fc 100644 --- a/colors/base16-black-metal-marduk.vim +++ b/colors/base16-black-metal-marduk.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-mayhem.vim b/colors/base16-black-metal-mayhem.vim index a2822c8..b49a172 100644 --- a/colors/base16-black-metal-mayhem.vim +++ b/colors/base16-black-metal-mayhem.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-nile.vim b/colors/base16-black-metal-nile.vim index c718d03..dee416d 100644 --- a/colors/base16-black-metal-nile.vim +++ b/colors/base16-black-metal-nile.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal-venom.vim b/colors/base16-black-metal-venom.vim index ed9f2ea..775f020 100644 --- a/colors/base16-black-metal-venom.vim +++ b/colors/base16-black-metal-venom.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-black-metal.vim b/colors/base16-black-metal.vim index f1473a2..294db62 100644 --- a/colors/base16-black-metal.vim +++ b/colors/base16-black-metal.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim index 40c0119..0b17dcc 100644 --- a/colors/base16-brewer.vim +++ b/colors/base16-brewer.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim index 54c4cd8..dd7b7c2 100644 --- a/colors/base16-bright.vim +++ b/colors/base16-bright.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-brogrammer.vim b/colors/base16-brogrammer.vim index a816122..07d8a2c 100644 --- a/colors/base16-brogrammer.vim +++ b/colors/base16-brogrammer.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim index 45ac440..151dc30 100644 --- a/colors/base16-brushtrees-dark.vim +++ b/colors/base16-brushtrees-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim index 12323c9..36405be 100644 --- a/colors/base16-brushtrees.vim +++ b/colors/base16-brushtrees.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim index bc67b8b..fc9ae04 100644 --- a/colors/base16-chalk.vim +++ b/colors/base16-chalk.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim index 8704f0c..ac77eaf 100644 --- a/colors/base16-circus.vim +++ b/colors/base16-circus.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim index 614b17b..2af60ab 100644 --- a/colors/base16-classic-dark.vim +++ b/colors/base16-classic-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim index 2c0d775..1e678fa 100644 --- a/colors/base16-classic-light.vim +++ b/colors/base16-classic-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim index bb19f3f..8ebe504 100644 --- a/colors/base16-codeschool.vim +++ b/colors/base16-codeschool.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim index 6bb4d03..f0d735d 100644 --- a/colors/base16-cupcake.vim +++ b/colors/base16-cupcake.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim index 7ddc036..1d1564e 100644 --- a/colors/base16-cupertino.vim +++ b/colors/base16-cupertino.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-darkmoss.vim b/colors/base16-darkmoss.vim index d4bac21..7c5bb73 100644 --- a/colors/base16-darkmoss.vim +++ b/colors/base16-darkmoss.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim index 218e733..cbd0d5c 100644 --- a/colors/base16-darktooth.vim +++ b/colors/base16-darktooth.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-darkviolet.vim b/colors/base16-darkviolet.vim index 114e01f..88f8b7c 100644 --- a/colors/base16-darkviolet.vim +++ b/colors/base16-darkviolet.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-decaf.vim b/colors/base16-decaf.vim index 40cf872..8cd7cf8 100644 --- a/colors/base16-decaf.vim +++ b/colors/base16-decaf.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim index eb6bb08..0513786 100644 --- a/colors/base16-default-dark.vim +++ b/colors/base16-default-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim index 577e000..0a5c918 100644 --- a/colors/base16-default-light.vim +++ b/colors/base16-default-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-dirtysea.vim b/colors/base16-dirtysea.vim index dc9e380..a088e31 100644 --- a/colors/base16-dirtysea.vim +++ b/colors/base16-dirtysea.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim index 2590246..3bd86aa 100644 --- a/colors/base16-dracula.vim +++ b/colors/base16-dracula.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-edge-dark.vim b/colors/base16-edge-dark.vim index 643ad7e..de19dff 100644 --- a/colors/base16-edge-dark.vim +++ b/colors/base16-edge-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-edge-light.vim b/colors/base16-edge-light.vim index 3a34272..bb553f7 100644 --- a/colors/base16-edge-light.vim +++ b/colors/base16-edge-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim index 2492f35..97f658c 100644 --- a/colors/base16-eighties.vim +++ b/colors/base16-eighties.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim index d13fd3d..dff016d 100644 --- a/colors/base16-embers.vim +++ b/colors/base16-embers.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-equilibrium-dark.vim b/colors/base16-equilibrium-dark.vim index 7a10440..c91a3e9 100644 --- a/colors/base16-equilibrium-dark.vim +++ b/colors/base16-equilibrium-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-equilibrium-gray-dark.vim b/colors/base16-equilibrium-gray-dark.vim index 6fc1f6a..6a3cf9b 100644 --- a/colors/base16-equilibrium-gray-dark.vim +++ b/colors/base16-equilibrium-gray-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-equilibrium-gray-light.vim b/colors/base16-equilibrium-gray-light.vim index d4917b0..aaa6ba7 100644 --- a/colors/base16-equilibrium-gray-light.vim +++ b/colors/base16-equilibrium-gray-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-equilibrium-light.vim b/colors/base16-equilibrium-light.vim index 65fcb49..1ec95ed 100644 --- a/colors/base16-equilibrium-light.vim +++ b/colors/base16-equilibrium-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-espresso.vim b/colors/base16-espresso.vim index 6a05d6a..edee53e 100644 --- a/colors/base16-espresso.vim +++ b/colors/base16-espresso.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-eva-dim.vim b/colors/base16-eva-dim.vim index fe007e4..67b4b68 100644 --- a/colors/base16-eva-dim.vim +++ b/colors/base16-eva-dim.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-eva.vim b/colors/base16-eva.vim index 869ed2b..c5c3b28 100644 --- a/colors/base16-eva.vim +++ b/colors/base16-eva.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim index 58e8136..9564055 100644 --- a/colors/base16-flat.vim +++ b/colors/base16-flat.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-framer.vim b/colors/base16-framer.vim index 46a83ca..6e71784 100644 --- a/colors/base16-framer.vim +++ b/colors/base16-framer.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-fruit-soda.vim b/colors/base16-fruit-soda.vim index 1140295..5147710 100644 --- a/colors/base16-fruit-soda.vim +++ b/colors/base16-fruit-soda.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-gigavolt.vim b/colors/base16-gigavolt.vim index 3f08efd..368c140 100644 --- a/colors/base16-gigavolt.vim +++ b/colors/base16-gigavolt.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-github.vim b/colors/base16-github.vim index 5d22cf1..7bbf898 100644 --- a/colors/base16-github.vim +++ b/colors/base16-github.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim index 9a4b4dd..057d2c9 100644 --- a/colors/base16-google-dark.vim +++ b/colors/base16-google-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim index 17a89bb..5107a1a 100644 --- a/colors/base16-google-light.vim +++ b/colors/base16-google-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim index 38976d6..e5bbdd1 100644 --- a/colors/base16-grayscale-dark.vim +++ b/colors/base16-grayscale-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim index 2230164..4cb80d3 100644 --- a/colors/base16-grayscale-light.vim +++ b/colors/base16-grayscale-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim index 8b15922..4bef348 100644 --- a/colors/base16-greenscreen.vim +++ b/colors/base16-greenscreen.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim index e76d331..5c45677 100644 --- a/colors/base16-gruvbox-dark-hard.vim +++ b/colors/base16-gruvbox-dark-hard.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim index d740029..b1d868f 100644 --- a/colors/base16-gruvbox-dark-medium.vim +++ b/colors/base16-gruvbox-dark-medium.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim index f45162c..2872a00 100644 --- a/colors/base16-gruvbox-dark-pale.vim +++ b/colors/base16-gruvbox-dark-pale.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim index 7323766..bf34f35 100644 --- a/colors/base16-gruvbox-dark-soft.vim +++ b/colors/base16-gruvbox-dark-soft.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim index edc085b..f3fd004 100644 --- a/colors/base16-gruvbox-light-hard.vim +++ b/colors/base16-gruvbox-light-hard.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim index d2284b1..272f147 100644 --- a/colors/base16-gruvbox-light-medium.vim +++ b/colors/base16-gruvbox-light-medium.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim index 0c8f807..673dc12 100644 --- a/colors/base16-gruvbox-light-soft.vim +++ b/colors/base16-gruvbox-light-soft.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-hardcore.vim b/colors/base16-hardcore.vim index 4d5cc78..7660944 100644 --- a/colors/base16-hardcore.vim +++ b/colors/base16-hardcore.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim index 8f16a97..17c63bf 100644 --- a/colors/base16-harmonic-dark.vim +++ b/colors/base16-harmonic-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim index a214ca9..f61e37c 100644 --- a/colors/base16-harmonic-light.vim +++ b/colors/base16-harmonic-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-heetch-light.vim b/colors/base16-heetch-light.vim index 190ec2c..0dab45d 100644 --- a/colors/base16-heetch-light.vim +++ b/colors/base16-heetch-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-heetch.vim b/colors/base16-heetch.vim index 8bda343..68eea58 100644 --- a/colors/base16-heetch.vim +++ b/colors/base16-heetch.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-helios.vim b/colors/base16-helios.vim index decc16c..6d4f0ff 100644 --- a/colors/base16-helios.vim +++ b/colors/base16-helios.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim index c5cc7f1..11b3050 100644 --- a/colors/base16-hopscotch.vim +++ b/colors/base16-hopscotch.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-horizon-dark.vim b/colors/base16-horizon-dark.vim index 437fd91..a431a29 100644 --- a/colors/base16-horizon-dark.vim +++ b/colors/base16-horizon-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-horizon-light.vim b/colors/base16-horizon-light.vim index 9e5ef13..506f806 100644 --- a/colors/base16-horizon-light.vim +++ b/colors/base16-horizon-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-horizon-terminal-dark.vim b/colors/base16-horizon-terminal-dark.vim index 34bd209..7fdb72e 100644 --- a/colors/base16-horizon-terminal-dark.vim +++ b/colors/base16-horizon-terminal-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-horizon-terminal-light.vim b/colors/base16-horizon-terminal-light.vim index 1ee34cd..f6de5a2 100644 --- a/colors/base16-horizon-terminal-light.vim +++ b/colors/base16-horizon-terminal-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-humanoid-dark.vim b/colors/base16-humanoid-dark.vim index d2efd82..a7080bf 100644 --- a/colors/base16-humanoid-dark.vim +++ b/colors/base16-humanoid-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-humanoid-light.vim b/colors/base16-humanoid-light.vim index f0fb978..f7b52e9 100644 --- a/colors/base16-humanoid-light.vim +++ b/colors/base16-humanoid-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-ia-dark.vim b/colors/base16-ia-dark.vim index bd44a03..e7fce15 100644 --- a/colors/base16-ia-dark.vim +++ b/colors/base16-ia-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-ia-light.vim b/colors/base16-ia-light.vim index abd0ac2..3e3ba1a 100644 --- a/colors/base16-ia-light.vim +++ b/colors/base16-ia-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim index d231dc1..1225e86 100644 --- a/colors/base16-icy.vim +++ b/colors/base16-icy.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim index f095ae8..621b684 100644 --- a/colors/base16-irblack.vim +++ b/colors/base16-irblack.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim index 22ab7ca..27c8c78 100644 --- a/colors/base16-isotope.vim +++ b/colors/base16-isotope.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-kimber.vim b/colors/base16-kimber.vim index f191446..c52c03a 100644 --- a/colors/base16-kimber.vim +++ b/colors/base16-kimber.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim index 972d66e..515a27d 100644 --- a/colors/base16-macintosh.vim +++ b/colors/base16-macintosh.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim index 7829691..b2bf61a 100644 --- a/colors/base16-marrakesh.vim +++ b/colors/base16-marrakesh.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim index 00f582c..54e78e8 100644 --- a/colors/base16-materia.vim +++ b/colors/base16-materia.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim index 900f14f..42d740a 100644 --- a/colors/base16-material-darker.vim +++ b/colors/base16-material-darker.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim index a5dbda4..2d9eb8e 100644 --- a/colors/base16-material-lighter.vim +++ b/colors/base16-material-lighter.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim index 9ad1bbd..b8d3de7 100644 --- a/colors/base16-material-palenight.vim +++ b/colors/base16-material-palenight.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-material-vivid.vim b/colors/base16-material-vivid.vim index 0af0c28..19f2792 100644 --- a/colors/base16-material-vivid.vim +++ b/colors/base16-material-vivid.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-material.vim b/colors/base16-material.vim index d806608..7625f90 100644 --- a/colors/base16-material.vim +++ b/colors/base16-material.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim index 86e4d38..2e26e0d 100644 --- a/colors/base16-mellow-purple.vim +++ b/colors/base16-mellow-purple.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim index 5313ee8..12df2e0 100644 --- a/colors/base16-mexico-light.vim +++ b/colors/base16-mexico-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim index 883d02c..7fb3560 100644 --- a/colors/base16-mocha.vim +++ b/colors/base16-mocha.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim index 156e243..18d45e8 100644 --- a/colors/base16-monokai.vim +++ b/colors/base16-monokai.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-nebula.vim b/colors/base16-nebula.vim index eb5b5c6..7b7db34 100644 --- a/colors/base16-nebula.vim +++ b/colors/base16-nebula.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim index 87da4d3..6084ffd 100644 --- a/colors/base16-nord.vim +++ b/colors/base16-nord.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-nova.vim b/colors/base16-nova.vim index 4fee474..b8c1d03 100644 --- a/colors/base16-nova.vim +++ b/colors/base16-nova.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim index d9dd671..6fec8ef 100644 --- a/colors/base16-ocean.vim +++ b/colors/base16-ocean.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim index 77d39f7..d60654f 100644 --- a/colors/base16-oceanicnext.vim +++ b/colors/base16-oceanicnext.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim index cce9c8e..caf5edf 100644 --- a/colors/base16-one-light.vim +++ b/colors/base16-one-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim index a952dc3..e6975d2 100644 --- a/colors/base16-onedark.vim +++ b/colors/base16-onedark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-outrun-dark.vim b/colors/base16-outrun-dark.vim index 4a79b33..2617412 100644 --- a/colors/base16-outrun-dark.vim +++ b/colors/base16-outrun-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-papercolor-dark.vim b/colors/base16-papercolor-dark.vim index 3627054..7ade09d 100644 --- a/colors/base16-papercolor-dark.vim +++ b/colors/base16-papercolor-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-papercolor-light.vim b/colors/base16-papercolor-light.vim index 574c373..c95a8e4 100644 --- a/colors/base16-papercolor-light.vim +++ b/colors/base16-papercolor-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim index 75281af..cd08408 100644 --- a/colors/base16-paraiso.vim +++ b/colors/base16-paraiso.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-pasque.vim b/colors/base16-pasque.vim index 6a71207..90c7d68 100644 --- a/colors/base16-pasque.vim +++ b/colors/base16-pasque.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim index 5dac216..61ada4c 100644 --- a/colors/base16-phd.vim +++ b/colors/base16-phd.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim index ab60971..8d7c570 100644 --- a/colors/base16-pico.vim +++ b/colors/base16-pico.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim index 5221ee9..0790617 100644 --- a/colors/base16-pop.vim +++ b/colors/base16-pop.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim index 6e37a47..c6ae10f 100644 --- a/colors/base16-porple.vim +++ b/colors/base16-porple.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim index 64500af..13d9d84 100644 --- a/colors/base16-railscasts.vim +++ b/colors/base16-railscasts.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim index 7aca8aa..ba92cc2 100644 --- a/colors/base16-rebecca.vim +++ b/colors/base16-rebecca.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-sagelight.vim b/colors/base16-sagelight.vim index 3327486..40015f4 100644 --- a/colors/base16-sagelight.vim +++ b/colors/base16-sagelight.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-sandcastle.vim b/colors/base16-sandcastle.vim index eec0ac8..e2d5cee 100644 --- a/colors/base16-sandcastle.vim +++ b/colors/base16-sandcastle.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim index 1dfe49c..95086c4 100644 --- a/colors/base16-seti.vim +++ b/colors/base16-seti.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim index e0b1553..84195af 100644 --- a/colors/base16-shapeshifter.vim +++ b/colors/base16-shapeshifter.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-silk-dark.vim b/colors/base16-silk-dark.vim index 95bcd26..173ddf9 100644 --- a/colors/base16-silk-dark.vim +++ b/colors/base16-silk-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-silk-light.vim b/colors/base16-silk-light.vim index d470f64..ea94dcc 100644 --- a/colors/base16-silk-light.vim +++ b/colors/base16-silk-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-snazzy.vim b/colors/base16-snazzy.vim index dae13ba..7d88b5a 100644 --- a/colors/base16-snazzy.vim +++ b/colors/base16-snazzy.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-solarflare-light.vim b/colors/base16-solarflare-light.vim index 07afc66..009a6fc 100644 --- a/colors/base16-solarflare-light.vim +++ b/colors/base16-solarflare-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim index 1f1f6b3..f8518a2 100644 --- a/colors/base16-solarflare.vim +++ b/colors/base16-solarflare.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim index 4943637..c844030 100644 --- a/colors/base16-solarized-dark.vim +++ b/colors/base16-solarized-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim index 09d2843..1c02967 100644 --- a/colors/base16-solarized-light.vim +++ b/colors/base16-solarized-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim index 47ca96e..6b84bd4 100644 --- a/colors/base16-spacemacs.vim +++ b/colors/base16-spacemacs.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-summercamp.vim b/colors/base16-summercamp.vim index dc3dbef..2dae010 100644 --- a/colors/base16-summercamp.vim +++ b/colors/base16-summercamp.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim index 5cf41b7..8a6adfa 100644 --- a/colors/base16-summerfruit-dark.vim +++ b/colors/base16-summerfruit-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim index 78956d0..56bcc52 100644 --- a/colors/base16-summerfruit-light.vim +++ b/colors/base16-summerfruit-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-synth-midnight-dark.vim b/colors/base16-synth-midnight-dark.vim index 1f8c6f9..ee955e9 100644 --- a/colors/base16-synth-midnight-dark.vim +++ b/colors/base16-synth-midnight-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-synth-midnight-light.vim b/colors/base16-synth-midnight-light.vim index 7f36429..00d29c8 100644 --- a/colors/base16-synth-midnight-light.vim +++ b/colors/base16-synth-midnight-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-tango.vim b/colors/base16-tango.vim index 901864b..e983859 100644 --- a/colors/base16-tango.vim +++ b/colors/base16-tango.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-tomorrow-night-eighties.vim b/colors/base16-tomorrow-night-eighties.vim index 24a6bb1..8597d51 100644 --- a/colors/base16-tomorrow-night-eighties.vim +++ b/colors/base16-tomorrow-night-eighties.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim index f7b65aa..c470381 100644 --- a/colors/base16-tomorrow-night.vim +++ b/colors/base16-tomorrow-night.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim index 780492a..c887a56 100644 --- a/colors/base16-tomorrow.vim +++ b/colors/base16-tomorrow.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim index dc22c30..16adcde 100644 --- a/colors/base16-tube.vim +++ b/colors/base16-tube.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim index 9b40056..88e8f5a 100644 --- a/colors/base16-twilight.vim +++ b/colors/base16-twilight.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim index ce11d21..22a4e9d 100644 --- a/colors/base16-unikitty-dark.vim +++ b/colors/base16-unikitty-dark.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim index d51f6d1..c3eb28a 100644 --- a/colors/base16-unikitty-light.vim +++ b/colors/base16-unikitty-light.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-vulcan.vim b/colors/base16-vulcan.vim index 658d762..d1efbf1 100644 --- a/colors/base16-vulcan.vim +++ b/colors/base16-vulcan.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim index 8afdfa7..3deff8d 100644 --- a/colors/base16-woodland.vim +++ b/colors/base16-woodland.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim index b20306c..f44733c 100644 --- a/colors/base16-xcode-dusk.vim +++ b/colors/base16-xcode-dusk.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim index 53fdc57..c64f01a 100644 --- a/colors/base16-zenburn.vim +++ b/colors/base16-zenburn.vim @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting diff --git a/templates/default.mustache b/templates/default.mustache index 3e47202..4b3cdbc 100644 --- a/templates/default.mustache +++ b/templates/default.mustache @@ -204,7 +204,7 @@ call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -221,20 +221,20 @@ call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui02, s:cterm05, s:cterm02, "none", "") call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") @@ -255,7 +255,7 @@ call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") -call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("Operator", s:gui0F, "", s:cterm0F, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") @@ -269,6 +269,32 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") +" Standard highlights to be used by plugins +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + " C highlighting call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") @@ -282,16 +308,46 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") +" Clap highlighting +hi default link ClapInput ColorColumn +hi default link ClapSpinner ColorColumn +hi default link ClapDisplay Default +hi default link ClapPreview ColorColumn +hi default link ClapCurrentSelection CursorLine +hi default link ClapNoMatchesFound ErrorFloat + +" Coc highlighting +hi default link CocErrorSign ErrorSign +hi default link CocWarningSign WarningSign +hi default link CocInfoSign InfoSign +hi default link CocHintSign HintSign + +hi default link CocErrorFloat ErrorFloat +hi default link CocWarningFloat WarningFloat +hi default link CocInfoFloat InfoFloat +hi default link CocHintFloat HintFloat + +hi default link CocErrorHighlight ErrorHighlight +hi default link CocWarningHighlight WarningHighlight +hi default link CocInfoHighlight InfoHighlight +hi default link CocHintHighlight HintHighlight +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + " CSS highlighting call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") " Diff highlighting -call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdd", s:gui0B, s:gui02, s:cterm0B, s:cterm02, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui02, s:cterm05, s:cterm02, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui02, s:cterm08, s:cterm02, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") @@ -316,14 +372,14 @@ call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") " GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +hi default link GitGutterAdd GitAddSign +hi default link GitGutterChange GitChangeSign +hi default link GitGutterDelete GitDeleteSign +hi default link GitGutterChangeDelete GitChangeDeleteSign " HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") @@ -396,15 +452,9 @@ call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") " Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", s:gui00, s:gui08, s:cterm00, s:cterm08, "undercurl", s:gui08) -call <sid>hi("SpellLocal", s:gui00, s:gui0C, s:cterm00, s:cterm0C, "undercurl", s:gui0C) -call <sid>hi("SpellCap", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "undercurl", s:gui0D) -call <sid>hi("SpellRare", s:gui00, s:gui0E, s:cterm00, s:cterm0E, "undercurl", s:gui0E) +hi default link SignifySignAdd GitAddSign +hi default link SignifySignChange GitChangeSign +hi default link SignifySignDelete GitDeleteSign " Startify highlighting call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") @@ -426,6 +476,10 @@ if has("nvim") call <sid>hi("TSProperty", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("TSType", s:gui08, "", s:cterm08, "", "none", "") + + " Treesitter-refactor highlighting + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") endif " LSP highlighting |