Update for neovim 0.10HEADtrunk

This version of neovim adds a bunch of new highlight classes and changes
some defaults, so we have to adapt a lot of the theming here.

1 files changed, 82 insertions, 48 deletions

diff --git a/colors/summit.vim b/colors/summit.vim
index ff7cc78..d206096 100644
--- a/colors/summit.vim
+++ b/colors/summit.vim
@@ -4,7 +4,7 @@ set background=light
 
 let g:colors_name = "summit"
 
-function! s:hi(group, fg, bg, gui)
+function! s:hi(group, fg, bg, gui, sp)
 	let l:res = "hi " . a:group
 
 	if a:fg != ""
@@ -20,6 +20,10 @@ function! s:hi(group, fg, bg, gui)
 		let l:res = l:res . " cterm=". a:gui
 	endif
 
+	if a:sp != ""
+		let l:res = l:res . " guisp=" . a:sp
+	endif
+
 	execute l:res
 endfunction
 
@@ -56,63 +60,83 @@ let s:red_text         = "#403531"
 let s:teal_bg          = "#e0f1eb"
 let s:violet           = "#554e6a"
 let s:violet_bg        = "#e6e0f5"
+let s:warning          = "#cb4600"
+let s:warning_sp       = "#ff9957"
 
 call s:reset("Title")
 call s:reset("Underlined")
 call s:reset("Error")
 
-call s:hi ("Bold",         "",               "",                 "bold")
-call s:hi ("ColorColumn",  "",               s:base7,            "none")
-call s:hi ("Comment",      s:grey,           "",                 "italic")
-call s:hi ("CursorLineNr", s:base0,          s:base4,            "bold")
-call s:hi ("CursorLine",   "",               s:base4,            "none")
-call s:hi ("DiffAdd",      s:green_text,     s:diff_add,         "none")
-call s:hi ("DiffChange",   s:blue_text,      s:diff_change,      "none")
-call s:hi ("DiffDelete",   s:red_text,       s:diff_delete,      "none")
-call s:hi ("DiffText",     s:blue_text_dark, s:diff_change_dark, "none")
-call s:hi ("Error",        s:red,            "",                 "bold")
-call s:hi ("ErrorMsg",     s:base8,          s:red_bg,           "none")
-call s:hi ("FoldColumn",   s:base2,          s:base4,            "bold")
-call s:hi ("Folded",       s:orange_text,    s:orange_bg,        "none")
-call s:hi ("IncSearch",    s:base1,          s:lime_bg_tint,     "underline")
-call s:hi ("Include",      s:base1,          "",                 "none")
-call s:hi ("Italic",       "",               "",                 "italic")
-call s:hi ("LineNr",       s:base2,          s:base8,            "none")
-call s:hi ("MatchParen",   s:base8,          s:accent,           "bold,inverse")
-call s:hi ("MoreMsg",      s:base1,          "",                 "bold")
-call s:hi ("NonText",      s:base3,          "",                 "none")
-call s:hi ("Normal",       s:base1,          "",                 "none")
-call s:hi ("Pmenu",        s:base0,          s:violet_bg,        "none")
-call s:hi ("PmenuSbar",    s:base0,          s:violet_bg,        "none")
-call s:hi ("PmenuSel",     s:base8,          s:violet,           "bold")
-call s:hi ("PmenuThumb",   s:base8,          s:base1,            "none")
-call s:hi ("Search",       s:base1,          s:lime_bg,          "none")
-call s:hi ("SignColumn",   s:base1,          s:base5,            "none")
-call s:hi ("Special",      s:accent,         "",                 "none")
-call s:hi ("Statement",    s:base1,          "",                 "none")
-call s:hi ("StatusLine",   s:base8,          s:violet,           "bold")
-call s:hi ("StatusLineNC", s:base0,          s:violet_bg,        "none")
-call s:hi ("String",       s:accent,         "",                 "none")
-call s:hi ("TabLine",      s:base0,          s:violet_bg,        "none")
-call s:hi ("TabLineFill",  s:base0,          s:violet_bg,        "none")
-call s:hi ("TabLineSel",   s:base8,          s:violet,           "bold")
-call s:hi ("TabLineSel",   s:base8,          s:violet,           "bold")
-call s:hi ("Title",        "",               "",                 "bold")
-call s:hi ("Todo",         s:base8,          s:pink,             "none")
-call s:hi ("Underlined",   "",               "",                 "underline")
-call s:hi ("VertSplit",    s:base2,          s:base8,            "none")
-call s:hi ("Visual",       "",               s:teal_bg,          "none")
-call s:hi ("WarningMsg",   s:red,            "",                 "none")
-
-hi! LspDiagnosticsUnderlineError	gui=underline guisp=Red
-hi! LspDiagnosticsUnderlineWarning	gui=underline guisp=Orange
-hi! LspDiagnosticsUnderlineInformation	gui=underline guisp=Blue
-hi! LspDiagnosticsUnderlineHint	gui=underline guisp=Cyan
+call s:hi ("Bold",         "",               "",                 "bold", "")
+call s:hi ("ColorColumn",  "",               s:base7,            "none", "")
+call s:hi ("Comment",      s:grey,           "",                 "italic", "")
+call s:hi ("CursorLineNr", s:base0,          s:base4,            "bold", "")
+call s:hi ("CursorLine",   "",               s:base4,            "none", "")
+call s:hi ("DiffAdd",      s:green_text,     s:diff_add,         "none", "")
+call s:hi ("DiffChange",   s:blue_text,      s:diff_change,      "none", "")
+call s:hi ("DiffDelete",   s:red_text,       s:diff_delete,      "none", "")
+call s:hi ("DiffText",     s:blue_text_dark, s:diff_change_dark, "none", "")
+call s:hi ("Error",        s:red,            "",                 "bold", "")
+call s:hi ("ErrorMsg",     s:base8,          s:red_bg,           "none", "")
+call s:hi ("FoldColumn",   s:base2,          s:base4,            "bold", "")
+call s:hi ("Folded",       s:orange_text,    s:orange_bg,        "none", "")
+call s:hi ("IncSearch",    s:base1,          s:lime_bg_tint,     "underline", "")
+call s:hi ("Include",      s:base1,          "",                 "none", "")
+call s:hi ("Italic",       "",               "",                 "italic", "")
+call s:hi ("LineNr",       s:base2,          s:base8,            "none", "")
+call s:hi ("MatchParen",   s:base8,          s:accent,           "bold,inverse", "")
+call s:hi ("MoreMsg",      s:base1,          "",                 "bold", "")
+call s:hi ("NonText",      s:base3,          "",                 "none", "")
+call s:hi ("Normal",       s:base1,          s:base8,            "none", "")
+call s:hi ("Pmenu",        s:base0,          s:violet_bg,        "none", "")
+call s:hi ("PmenuSbar",    s:base0,          s:violet_bg,        "none", "")
+call s:hi ("PmenuSel",     s:base8,          s:violet,           "bold", "")
+call s:hi ("PmenuThumb",   s:base8,          s:base1,            "none", "")
+call s:hi ("Search",       s:base1,          s:lime_bg,          "none", "")
+call s:hi ("SignColumn",   s:base1,          s:base5,            "none", "")
+call s:hi ("Special",      s:accent,         "",                 "none", "")
+call s:hi ("Statement",    s:base1,          "",                 "none", "")
+call s:hi ("StatusLine",   s:base8,          s:violet,           "bold", "")
+call s:hi ("StatusLineNC", s:base0,          s:violet_bg,        "none", "")
+call s:hi ("String",       s:accent,         "",                 "none", "")
+call s:hi ("TabLine",      s:base0,          s:violet_bg,        "none", "")
+call s:hi ("TabLineFill",  s:base0,          s:violet_bg,        "none", "")
+call s:hi ("TabLineSel",   s:base8,          s:violet,           "bold", "")
+call s:hi ("TabLineSel",   s:base8,          s:violet,           "bold", "")
+call s:hi ("Title",        "",               "",                 "bold", "")
+call s:hi ("Todo",         s:base8,          s:pink,             "none", "")
+call s:hi ("Underlined",   "",               "",                 "underline", "")
+call s:hi ("VertSplit",    s:base2,          s:base8,            "none", "")
+call s:hi ("Visual",       "",               s:teal_bg,          "none", "")
+call s:hi ("WarningMsg",   s:red,            "",                 "none", "")
+
+call s:hi ("SpellBad", "", "", "", s:red_bg)
+call s:hi ("SpellCap", "", "", "", s:accent)
+call s:hi ("SpellRare", "", "", "", s:violet)
+call s:hi ("SpellLocal", "", "", "", s:diff_add)
+
+call s:hi ("DiagnosticError", s:red, "", "", "")
+call s:hi ("DiagnosticWarn", s:warning, "", "", "")
+call s:hi ("DiagnosticInfo", s:accent, "", "", "")
+call s:hi ("DiagnosticHint", s:grey, "", "", "")
+call s:hi ("DiagnosticOk", "NvimDarkGreen", "", "", "")
+
+call s:hi ("DiagnosticUnderlineError", "fg", "", "underline", s:red_bg)
+call s:hi ("DiagnosticUnderlineWarn", "fg", "", "undercurl", s:warning_sp)
+call s:hi ("DiagnosticUnderlineInfo", "fg", "", "undercurl", s:accent)
+call s:hi ("DiagnosticUnderlineHint", "fg", "", "undercurl", s:grey)
+call s:hi ("DiagnosticUnderlineOk", "fg", "", "undercurl", s:diff_add)
+
+hi! link FloatBorder Normal
+hi! link NormalFloat Normal
 
 hi! link Directory Special
 hi! link ModeMsg MoreMsg
 hi! link Question MoreMsg
 
+hi! link CurSearch Search
+hi! link QuickFixLine Search
+
 hi! link Conceal Comment
 hi! link Constant Normal
 hi! link Delimiter Normal
@@ -121,6 +145,7 @@ hi! link Keyword Normal
 hi! link Number Normal
 hi! link Operator Normal
 hi! link Type Normal
+hi! link Function Normal
 
 hi! link PreProc Special
 hi! link SpecialKey Special
@@ -148,6 +173,15 @@ hi! link pythonStatement Bold
 hi! link GentooPackageUseUse Special
 hi! link GentooPackageUseUnuse WarningMsg
 
+hi! link mailQuoted1 Comment
+hi! link mailQuoted2 Comment
+
+hi! link DiagnosticVirtualTextError Comment
+hi! link DiagnosticVirtualTextWarn Comment
+hi! link DiagnosticVirtualTextInfo Comment
+hi! link DiagnosticVirtualTextHint Comment
+hi! link DiagnosticVirtualTextOk Comment
+
 let g:terminal_color_0  = "#0a0a0a"
 let g:terminal_color_1  = "#9f253e"
 let g:terminal_color_2  = "#377945"