diff options
Diffstat (limited to 'colors/base16-apprentice.vim')
| -rw-r--r-- | colors/base16-apprentice.vim | 455 |
1 files changed, 325 insertions, 130 deletions
diff --git a/colors/base16-apprentice.vim b/colors/base16-apprentice.vim index e384686..a27cca4 100644 --- a/colors/base16-apprentice.vim +++ b/colors/base16-apprentice.vim @@ -21,32 +21,32 @@ let s:gui01 = "303030" let g:base16_gui01 = "303030" let s:gui02 = "333333" let g:base16_gui02 = "333333" -let s:gui03 = "6C6C6C" -let g:base16_gui03 = "6C6C6C" +let s:gui03 = "6c6c6c" +let g:base16_gui03 = "6c6c6c" let s:gui04 = "787878" let g:base16_gui04 = "787878" -let s:gui05 = "BCBCBC" -let g:base16_gui05 = "BCBCBC" -let s:gui06 = "C9C9C9" -let g:base16_gui06 = "C9C9C9" -let s:gui07 = "FFFFFF" -let g:base16_gui07 = "FFFFFF" -let s:gui08 = "5F8787" -let g:base16_gui08 = "5F8787" -let s:gui09 = "FF8700" -let g:base16_gui09 = "FF8700" -let s:gui0A = "5F8787" -let g:base16_gui0A = "5F8787" -let s:gui0B = "87AF87" -let g:base16_gui0B = "87AF87" -let s:gui0C = "5F875F" -let g:base16_gui0C = "5F875F" -let s:gui0D = "FFFFAF" -let g:base16_gui0D = "FFFFAF" -let s:gui0E = "87AFD7" -let g:base16_gui0E = "87AFD7" -let s:gui0F = "5F87AF" -let g:base16_gui0F = "5F87AF" +let s:gui05 = "bcbcbc" +let g:base16_gui05 = "bcbcbc" +let s:gui06 = "c9c9c9" +let g:base16_gui06 = "c9c9c9" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "5f8787" +let g:base16_gui08 = "5f8787" +let s:gui09 = "ff8700" +let g:base16_gui09 = "ff8700" +let s:gui0A = "5f8787" +let g:base16_gui0A = "5f8787" +let s:gui0B = "87af87" +let g:base16_gui0B = "87af87" +let s:gui0C = "5f875f" +let g:base16_gui0C = "5f875f" +let s:gui0D = "ffffaf" +let g:base16_gui0D = "ffffaf" +let s:gui0E = "87afd7" +let g:base16_gui0E = "87afd7" +let s:gui0F = "5f87af" +let g:base16_gui0F = "5f87af" " Terminal color definitions let s:cterm00 = "00" @@ -100,21 +100,21 @@ endif " Neovim terminal colours if has("nvim") let g:terminal_color_0 = "#262626" - let g:terminal_color_1 = "#5F8787" - let g:terminal_color_2 = "#87AF87" - let g:terminal_color_3 = "#5F8787" - let g:terminal_color_4 = "#FFFFAF" - let g:terminal_color_5 = "#87AFD7" - let g:terminal_color_6 = "#5F875F" - let g:terminal_color_7 = "#BCBCBC" - let g:terminal_color_8 = "#6C6C6C" - let g:terminal_color_9 = "#5F8787" - let g:terminal_color_10 = "#87AF87" - let g:terminal_color_11 = "#5F8787" - let g:terminal_color_12 = "#FFFFAF" - let g:terminal_color_13 = "#87AFD7" - let g:terminal_color_14 = "#5F875F" - let g:terminal_color_15 = "#FFFFFF" + let g:terminal_color_1 = "#5f8787" + let g:terminal_color_2 = "#87af87" + let g:terminal_color_3 = "#5f8787" + let g:terminal_color_4 = "#ffffaf" + let g:terminal_color_5 = "#87afd7" + let g:terminal_color_6 = "#5f875f" + let g:terminal_color_7 = "#bcbcbc" + let g:terminal_color_8 = "#6c6c6c" + let g:terminal_color_9 = "#5f8787" + let g:terminal_color_10 = "#87af87" + let g:terminal_color_11 = "#5f8787" + let g:terminal_color_12 = "#ffffaf" + let g:terminal_color_13 = "#87afd7" + let g:terminal_color_14 = "#5f875f" + let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" @@ -124,21 +124,21 @@ if has("nvim") elseif has("terminal") let g:terminal_ansi_colors = [ \ "#262626", - \ "#5F8787", - \ "#87AF87", - \ "#5F8787", - \ "#FFFFAF", - \ "#87AFD7", - \ "#5F875F", - \ "#BCBCBC", - \ "#6C6C6C", - \ "#5F8787", - \ "#87AF87", - \ "#5F8787", - \ "#FFFFAF", - \ "#87AFD7", - \ "#5F875F", - \ "#FFFFFF", + \ "#5f8787", + \ "#87af87", + \ "#5f8787", + \ "#ffffaf", + \ "#87afd7", + \ "#5f875f", + \ "#bcbcbc", + \ "#6c6c6c", + \ "#5f8787", + \ "#87af87", + \ "#5f8787", + \ "#ffffaf", + \ "#87afd7", + \ "#5f875f", + \ "#ffffff", \ ] endif @@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) let l:attr = get(a:, 1, "") let l:guisp = get(a:, 2, "") + " See :help highlight-guifg + let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"] + if a:guifg != "" - exec "hi " . a:group . " guifg=#" . a:guifg + if index(l:gui_special_names, a:guifg) >= 0 + exec "hi " . a:group . " guifg=" . a:guifg + else + exec "hi " . a:group . " guifg=#" . a:guifg + endif endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . a:guibg + if index(l:gui_special_names, a:guibg) >= 0 + exec "hi " . a:group . " guibg=" . a:guibg + else + exec "hi " . a:group . " guibg=#" . a:guibg + endif endif if a:ctermfg != "" exec "hi " . a:group . " ctermfg=" . a:ctermfg @@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif if l:guisp != "" - exec "hi " . a:group . " guisp=#" . l:guisp + if index(l:gui_special_names, l:guisp) >= 0 + exec "hi " . a:group . " guisp=" . l:guisp + else + exec "hi " . a:group . " guisp=#" . l:guisp + endif endif endfunction @@ -186,10 +201,10 @@ call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") -call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") -call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("FoldColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("Folded", s:gui02, s:gui00, s:cterm02, s:cterm00, "", "") call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") -call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Italic", "", "", "", "", "italic", "") call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") @@ -203,35 +218,38 @@ call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") -call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") -call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "") call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") -call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("Whitespace", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui00, s:cterm03, s:cterm00, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "") call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") -call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("VertSplit", s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "") call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "") call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") -call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") -call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("PMenu", s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui06, s:gui02, s:cterm06, s:cterm02, "", "") +call <sid>hi("PMenuSbar", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("PMenuThumb", "", s:gui04, "", s:cterm04, "", "") call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") -" Standard syntax highlighting +" Standard syntax call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") -call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Delimiter", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") @@ -241,9 +259,9 @@ call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") -call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("SpecialChar", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") @@ -253,11 +271,44 @@ call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") -" C highlighting +" Standard highlights to be used by plugins +call <sid>hi("Deprecated", "", "", "", "", "strikethrough", "") +call <sid>hi("SearchMatch", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("GitAddSign", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("GitChangeSign", s:gui04, "", s:cterm04, "", "", "") +call <sid>hi("GitDeleteSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("GitChangeDeleteSign", s:gui04, "", s:cterm04, "", "", "") + +call <sid>hi("ErrorSign", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningSign", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("InfoSign", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("HintSign", s:gui0C, "", s:cterm0C, "", "", "") + +call <sid>hi("ErrorFloat", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "") +call <sid>hi("InfoFloat", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("HintFloat", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") + +call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08) +call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09) +call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D) +call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C) + +call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E) + +call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("ReferenceWrite", s:gui01, s:gui08, s:cterm01, s:cterm08, "", "") + +" C call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") -" C# highlighting +" C# call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") @@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") -" CSS highlighting +" Clap +hi! link ClapInput ColorColumn +hi! link ClapSpinner ColorColumn +hi! link ClapDisplay Default +hi! link ClapPreview ColorColumn +hi! link ClapCurrentSelection CursorLine +hi! link ClapNoMatchesFound ErrorFloat + +" Coc +hi! link CocErrorSign ErrorSign +hi! link CocWarningSign WarningSign +hi! link CocInfoSign InfoSign +hi! link CocHintSign HintSign + +hi! link CocErrorFloat ErrorFloat +hi! link CocWarningFloat WarningFloat +hi! link CocInfoFloat InfoFloat +hi! link CocHintFloat HintFloat + +hi! link CocErrorHighlight ErrorHighlight +hi! link CocWarningHighlight WarningHighlight +hi! link CocInfoHighlight InfoHighlight +hi! link CocHintHighlight HintHighlight + +hi! link CocSem_angle Keyword +hi! link CocSem_annotation Keyword +hi! link CocSem_attribute Type +hi! link CocSem_bitwise Keyword +hi! link CocSem_boolean Boolean +hi! link CocSem_brace Normal +hi! link CocSem_bracket Normal +hi! link CocSem_builtinAttribute Type +hi! link CocSem_builtinType Type +hi! link CocSem_character String +hi! link CocSem_class Structure +hi! link CocSem_colon Normal +hi! link CocSem_comma Normal +hi! link CocSem_comment Comment +hi! link CocSem_comparison Keyword +hi! link CocSem_concept Keyword +hi! link CocSem_constParameter Identifier +hi! link CocSem_dependent Keyword +hi! link CocSem_dot Keyword +hi! link CocSem_enum Structure +hi! link CocSem_enumMember Constant +hi! link CocSem_escapeSequence Type +hi! link CocSem_event Identifier +hi! link CocSem_formatSpecifier Type +hi! link CocSem_function Function +hi! link CocSem_interface Type +hi! link CocSem_keyword Keyword +hi! link CocSem_label Keyword +hi! link CocSem_logical Keyword +hi! link CocSem_macro Macro +hi! link CocSem_method Function +hi! link CocSem_modifier Keyword +hi! link CocSem_namespace Identifier +hi! link CocSem_number Number +hi! link CocSem_operator Operator +hi! link CocSem_parameter Identifier +hi! link CocSem_parenthesis Normal +hi! link CocSem_property Identifier +hi! link CocSem_punctuation Keyword +hi! link CocSem_regexp Type +hi! link CocSem_selfKeyword Constant +hi! link CocSem_semicolon Normal +hi! link CocSem_string String +hi! link CocSem_struct Structure +hi! link CocSem_type Type +hi! link CocSem_typeAlias Type +hi! link CocSem_typeParameter Type +hi! link CocSem_unknown Normal +hi! link CocSem_variable Identifier + +call <sid>hi("CocHighlightRead", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("CocHighlightText", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("CocHighlightWrite", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("CocListMode", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "bold", "") +call <sid>hi("CocListPath", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "") +call <sid>hi("CocSessionsName", s:gui05, "", s:cterm05, "", "", "") + +" CSS call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") -" Diff highlighting +" CMP +hi! link CmpItemAbbrDeprecated Deprecated +hi! link CmpItemAbbrMatch SearchMatch +hi! link CmpItemAbbrMatchFuzzy SearchMatch +hi! link CmpItemKindText TSText +hi! link CmpItemKindMethod TSMethod +hi! link CmpItemKindFunction TSFunction +hi! link CmpItemKindConstructor TSConstructor +hi! link CmpItemKindField TSField +hi! link CmpItemKindVariable TSVariable +" hi! link CmpItemKindClass TS +hi! link CmpItemKindInterface TSText +" hi! link CmpItemKindModule TS +hi! link CmpItemKindProperty TSProperty +hi! link CmpItemKindUnit TSKeyword +" hi! link CmpItemKindValue TS +" hi! link CmpItemKindEnum TS +hi! link CmpItemKindKeyword TSKeyword +" hi! link CmpItemKindSnippet TS +" hi! link CmpItemKindColor TS +" hi! link CmpItemKindFile TS +" hi! link CmpItemKindReference TS +" hi! link CmpItemKindFolder TS +" hi! link CmpItemKindEnumMember TS +hi! link CmpItemKindConstant TSConstant +" hi! link CmpItemKindStruct TS +" hi! link CmpItemKindEvent TS +hi! link CmpItemKindOperator TSOperator +hi! link CmpItemKindTypeParameter TSType + +" Diff call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") -call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui05, s:gui01, s:cterm05, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui02, s:gui00, s:cterm02, s:cterm00, "", "") call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") @@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") -" Git highlighting +" Git call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") @@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") -" GitGutter highlighting -call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") -call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") +" GitGutter +hi! link GitGutterAdd GitAddSign +hi! link GitGutterChange GitChangeSign +hi! link GitGutterDelete GitDeleteSign +hi! link GitGutterChangeDelete GitChangeDeleteSign -" HTML highlighting -call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") -call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +" HTML +call <sid>hi("htmlBold", s:gui05, "", s:cterm0A, "", "bold", "") +call <sid>hi("htmlItalic", s:gui05, "", s:cterm0E, "", "italic", "") call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") -" JavaScript highlighting +" JavaScript call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") -" pangloss/vim-javascript highlighting +" pangloss/vim-javascript call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") @@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") -" Mail highlighting +" Mail call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") @@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") -" Markdown highlighting +" Markdown call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") -" NERDTree highlighting +" Matchup +call <sid>hi("MatchWord", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "underline", "") + +" NERDTree call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") -" PHP highlighting +" PHP call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") -" Python highlighting +" Python call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") -" Ruby highlighting +" Ruby call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") @@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") -" SASS highlighting +" SASS call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") -" Signify highlighting -call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") -call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") -call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - -" Spelling highlighting -call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) -call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) -call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) -call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) +" Signify +hi! link SignifySignAdd GitAddSign +hi! link SignifySignChange GitChangeSign +hi! link SignifySignDelete GitDeleteSign -" Startify highlighting +" Startify call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") @@ -402,29 +561,65 @@ call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") -" Java highlighting -call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") - " Treesitter -call <sid>hi("TSNote", s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "") -call <sid>hi("TSWarning", s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "") -call <sid>hi("TSWarning", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") -call <sid>hi("TSConstructor", s:gui0D, "", s:cterm0D, "", "", "") -call <sid>hi("TSField", s:gui0D, "", s:cterm0D, "", "", "") -call <sid>hi("TSKeyword", s:gui0E, "", s:cterm0E, "", "", "") -call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "") -call <sid>hi("TSLabel", s:gui0D, "", s:cterm0D, "", "", "") -call <sid>hi("TSOperator", s:gui05, "", s:cterm05, "", "", "") -call <sid>hi("TSParameter", s:gui0D, "", s:cterm0D, "", "", "") -call <sid>hi("TSProperty", s:gui0D, "", s:cterm0D, "", "", "") -call <sid>hi("TSPunctDelimiter", s:gui05, "", s:cterm05, "", "", "") -call <sid>hi("TSPunctBracket", s:gui0C, "", s:cterm0C, "", "", "") -call <sid>hi("TSPunctSpecial", s:gui05, "", s:cterm05, "", "", "") -call <sid>hi("TSStringRegex", s:gui0C, "", s:cterm0C, "", "", "") -call <sid>hi("TSStringEscape", s:gui0C, "", s:cterm0C, "", "", "") -call <sid>hi("TSVariable", s:gui08, "", s:cterm08, "", "", "") -call <sid>hi("TSVariableBuiltin", s:gui08, "", s:cterm08, "", "", "") -call <sid>hi("TSTextReference", s:gui0C, "", s:cterm0C, "", "", "") +hi! link TSVariable Identifier + +" Treesitter-refactor +if has("nvim") + call <sid>hi("TSDefinition", "", s:gui03, "", s:cterm03, "", "") + call <sid>hi("TSDefinitionUsage", "", s:gui02, "", s:cterm02, "none", "") +endif + +" LSP +if has("nvim") + hi! link DiagnosticError ErrorSign + hi! link DiagnosticWarn WarningSign + hi! link DiagnosticInfo InfoSign + hi! link DiagnosticHint HintSign + + hi! link DiagnosticFloatingError ErrorFloat + hi! link DiagnosticFloatingWarn WarningFloat + hi! link DiagnosticFloatingInfo InfoFloat + hi! link DiagnosticFloatingHint HintFloat + + hi! link DiagnosticUnderlineError ErrorHighlight + hi! link DiagnosticUnderlineWarn WarningHighlight + hi! link DiagnosticUnderlineInfo InfoHighlight + hi! link DiagnosticUnderlineHint HintHighlight + + hi! link DiagnosticsVirtualTextError ErrorSign + hi! link DiagnosticsVirtualTextWarning WarningSign + hi! link DiagnosticsVirtualTextInfo InfoSign + hi! link DiagnosticsVirtualTextHint HintSign + + " Remove untill endif on next nvim release + hi! link LspDiagnosticsSignError ErrorSign + hi! link LspDiagnosticsSignWarning WarningSign + hi! link LspDiagnosticsSignInfo InfoSign + hi! link LspDiagnosticsSignHint HintSign + + hi! link LspDiagnosticsVirtualTextError ErrorSign + hi! link LspDiagnosticsVirtualTextWarning WarningSign + hi! link LspDiagnosticsVirtualTextInfo InfoSign + hi! link LspDiagnosticsVirtualTextHint HintSign + + hi! link LspDiagnosticsFloatingError ErrorFloat + hi! link LspDiagnosticsFloatingWarning WarningFloat + hi! link LspDiagnosticsFloatingInfo InfoFloat + hi! link LspDiagnosticsFloatingHint HintFloat + + hi! link LspDiagnosticsUnderlineError ErrorHighlight + hi! link LspDiagnosticsUnderlineWarning WarningHighlight + hi! link LspDiagnosticsUnderlineInfo InfoHighlight + hi! link LspDiagnosticsUnderlineHint HintHighlight + + hi! link LspReferenceText ReferenceText + hi! link LspReferenceRead ReferenceRead + hi! link LspReferenceWrite ReferenceWrite +endif + +" Java +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") " Remove functions delf <sid>hi |