diff options
Diffstat (limited to 'colors')
162 files changed, 12798 insertions, 4536 deletions
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim index 1457552..831f262 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..4042317 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..6dcbcda 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..045651a 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..4d01057 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..75518ef 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..39cb573 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..38ed9ee 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..2fc628d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..cff51b9 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..3017eaf 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..989c0dd 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..fd625b7 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..d9343bc 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..fba21cc 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..a1503c9 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..14bf6b3 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..6e6349b 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..6b9d64f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..34694d3 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..3dae758 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..16fd26c 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..985ca37 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..a3b1136 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..fb91d29 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f80d75f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..d6fe1f8 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..d293870 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..c1d705e 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..9644630 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..519fd61 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..ab34c89 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f5e3849 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..ea210b6 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..4525b1f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f0994eb 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..bdc0e7a 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..2f6064b 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..179e307 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..1d6c01c 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..ac380ad 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..caa06df 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..47b9f80 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..1d744da 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..11b6e1c 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..86e2ad3 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..56e6045 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..1fe2b6f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..4786842 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..dfcf260 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..a812096 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..2e9022b 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..46e1b77 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f82f622 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..a05575c 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..76e9e90 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..3e619c1 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..910b1fc 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..eb44884 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..88820a1 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..aa0b75d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..b75352a 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..13f4b3d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..797c974 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..dada00f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..51ec15f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..d37e8a0 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..aa647dc 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..73e467d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..884d07f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..fd72b05 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..4922a86 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..61a9e24 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..8fcd7be 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..bcb7137 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f0ca95f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..181d152 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..45e25cc 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..13acec1 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..186df4a 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..c92115b 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..217a4ad 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..38c5f29 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..c23d0b5 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..99cd52d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..79e9739 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f4b3c24 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..8eec7f9 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..7cb639d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..92237cc 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..47119d2 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..7f682b9 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..7146a76 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..3d79e89 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..e2d8808 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..828c419 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..b1f6da8 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..c4b77b8 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..b65f0fd 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..bb87e4d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..4e4e80e 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..ad9a27e 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..30c9087 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..7377f7f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..516b298 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..0d7e9b3 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..b721142 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..12bc307 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..851e1d0 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..50fc7df 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..5299028 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..886d3dd 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..6c522a0 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..be8c6b0 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..69cee83 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..5b1577b 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..778914d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..0294bd1 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..ac77597 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..b3284df 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..11e25a0 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..a89e83b 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..e33f4a2 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..52302b4 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..573e005 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..c12f5b1 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..11f4369 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..26513dc 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..3a96ec9 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..fba0b14 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..27375c3 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..9aa422a 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f6a5c4d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..a8f5dec 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..ab745e3 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..a52acbb 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..825115d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..3bceab7 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..5d52e29 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f88fa7a 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..1976869 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..8233419 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..685f97c 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..c3c825e 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..65a4c31 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..2a29a63 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..6b990d2 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..b45d64f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..22ae612 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..757cef3 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f687df2 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..a97faab 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..755c2d9 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..f03260b 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..74b5d6f 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..90ac4f3 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..aea2c6d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..ffcadde 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..98ac81b 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..34823e8 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..2207e9d 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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..c13a0a9 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("CursorLine", "", s:gui02, "", s:cterm02, "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,43 @@ 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, "", "") + " 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 +369,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 +449,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 +473,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 |