Adapt to the new Neovim LSP highlight groups

See: neovim/neovim#12655
bluz71 · Nov 16, 2020 · 07b71f7 · 07b71f7
1 parent f75c6b8
commit 07b71f7
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/colors/nightfly.vim b/colors/nightfly.vim
@@ -769,9 +769,9 @@ highlight! link NeomakeMessageSign NightflyWhiteAlert
 
 " ALE plugin
 if g:nightflyUndercurls
-     exec 'highlight ALEError guibg=bg gui=undercurl guisp=' . s:red
-     exec 'highlight ALEWarning guibg=bg gui=undercurl guisp=' . s:yellow
-     exec 'highlight ALEInfo guibg=bg gui=undercurl guisp=' . s:blue
+    exec 'highlight ALEError guibg=bg gui=undercurl guisp=' . s:red
+    exec 'highlight ALEWarning guibg=bg gui=undercurl guisp=' . s:yellow
+    exec 'highlight ALEInfo guibg=bg gui=undercurl guisp=' . s:blue
 else
     exec 'highlight ALEError guibg=bg'
     exec 'highlight ALEWarning guibg=bg'
@@ -785,14 +785,29 @@ highlight! link ALEVirtualTextInfo NightflySteelBlue
 highlight! link ALEInfoSign NightflyBlueAlert
 
 " Neovim LSP diagnostics
-highlight! link LspDiagnosticsError NightflySteelBlue
-highlight! link LspDiagnosticsErrorSign NightflyRedAlert
-highlight! link LspDiagnosticsWarning NightflySteelBlue
-highlight! link LspDiagnosticsWarningSign NightflyYellowAlert
-highlight! link LspDiagnosticsInformation NightflySteelBlue
-highlight! link LspDiagnosticsInformationSign NightflyBlueAlert
-highlight! link LspDiagnosticsHint NightflySteelBlue
-highlight! link LspDiagnosticsHintSign NightflyWhiteAlert
+if g:nightflyUndercurls
+    exec 'highlight LspDiagnosticsUnderlineError guibg=bg gui=undercurl guisp=' . s:red
+    exec 'highlight LspDiagnosticsUnderlineWarning guibg=bg gui=undercurl guisp=' . s:yellow
+    exec 'highlight LspDiagnosticsUnderlineInformation guibg=bg gui=undercurl guisp=' . s:blue
+    exec 'highlight LspDiagnosticsUnderlineHint guibg=bg gui=undercurl guisp=' . s:white
+else
+    exec 'highlight LspDiagnosticsUnderlineError guibg=bg gui=underline guisp=' . s:red
+    exec 'highlight LspDiagnosticsUnderlineWarning guibg=bg gui=underline guisp=' . s:yellow
+    exec 'highlight LspDiagnosticsUnderlineInformation guibg=bg gui=underline guisp=' . s:blue
+    exec 'highlight LspDiagnosticsUnderlineHint guibg=bg gui=underline guisp=' . s:white
+endif
+highlight! link LspDiagnosticsVirtualTextError NightflySteelBlue
+highlight! link LspDiagnosticsSignError NightflyRedAlert
+highlight! link LspDiagnosticsFloatingError NightflyRed
+highlight! link LspDiagnosticsVirtualTextWarning NightflySteelBlue
+highlight! link LspDiagnosticsSignWarning NightflyYellowAlert
+highlight! link LspDiagnosticsFloatingWarning NightflyYellow
+highlight! link LspDiagnosticsVirtualTextInformation NightflySteelBlue
+highlight! link LspDiagnosticsSignInformation NightflyBlueAlert
+highlight! link LspDiagnosticsFloatingInformation NightflyBlue
+highlight! link LspDiagnosticsVirtualTextHint NightflySteelBlue
+highlight! link LspDiagnosticsSignHint NightflyWhiteAlert
+highlight! link LspDiagnosticsFloatingHint NightflyWhite
 
 " GitGutter plugin
 highlight! link GitGutterAdd NightflyEmeraldAlert