vim: fix builtin diagnostics

4 files changed, 28 insertions, 48 deletions

diff --git a/.vim/init.lua b/.vim/init.lua
index 2f37ad2..07b9fb2 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -254,17 +254,17 @@ function _G.statusline_color(mode)
 end
 function _G.statusline_lsp_diagnostics(bufnr)
   -- Error, Warning, Information, Hint
-  local error_num = vim.lsp.diagnostic.get_count(bufnr, 'Error')
-  local warn_num = vim.lsp.diagnostic.get_count(bufnr, 'Warning')
+  local error_num = vim.diagnostic.get(bufnr, {severity = vim.diagnostic.severity.ERROR})
+  local warn_num = vim.diagnostic.get(bufnr, {severity = vim.diagnostic.severity.WARN})
 
   local s = ''
-  if error_num > 0 then
-    s = s .. '%#LspDiagnosticsError#'
-    s = s .. vim.fn.sign_getdefined('LspDiagnosticsSignError')[1].text .. error_num
+  if #error_num > 0 then
+    s = s .. '%#DiagnosticError#'
+    s = s .. vim.fn.sign_getdefined('DiagnosticSignError')[1].text .. #error_num
   end
-  if warn_num > 0 then
-    s = s .. '%#LspDiagnosticsWarning#'
-    s = s .. vim.fn.sign_getdefined('LspDiagnosticsSignWarning')[1].text .. warn_num
+  if #warn_num > 0 then
+    s = s .. '%#DiagnosticWarn#'
+    s = s .. vim.fn.sign_getdefined('DiagnosticSignWarn')[1].text .. #warn_num
   end
   return s
 end
diff --git a/.vim/lua/colors.lua b/.vim/lua/colors.lua
index adf9941..7c1976e 100644
--- a/.vim/lua/colors.lua
+++ b/.vim/lua/colors.lua
@@ -168,29 +168,25 @@ return lush(function()
     -- }}}
 
     -- LSP {{{
-    DiagnosticError                      { Error },
-    LspDiagnosticsError                  { DiagnosticError },
-    LspDiagnosticsFloatingError          { DiagnosticError },
-    LspDiagnosticsVirtualTextError       { fg = DiagnosticError.fg.darken(40) },
-    LspDiagnosticsSignError              { DiagnosticError },
+    DiagnosticError            { Error },
+    DiagnosticFloatingError    { DiagnosticError },
+    DiagnosticVirtualTextError { fg = DiagnosticError.fg.darken(50), bg = DiagnosticError.fg.darken(90) },
+    DiagnosticSignError        { DiagnosticError },
 
-    DiagnosticWarn                       { WarningMsg },
-    LspDiagnosticsWarning                { DiagnosticWarn },
-    LspDiagnosticsFloatingWarning        { DiagnosticWarn },
-    LspDiagnosticsVirtualTextWarning     { fg = DiagnosticWarn.fg.darken(60) },
-    LspDiagnosticsSignWarning            { DiagnosticWarn },
+    DiagnosticWarn             { WarningMsg },
+    DiagnosticFloatingWarn     { DiagnosticWarn },
+    DiagnosticVirtualTextWarn  { fg = DiagnosticWarn.fg.darken(40), bg = DiagnosticWarn.fg.darken(90) },
+    DiagnosticSignWarn         { DiagnosticWarn },
 
-    DiagnosticInfo                       { MoreMsg },
-    LspDiagnosticsInformation            { DiagnosticInfo },
-    LspDiagnosticsFloatingInformation    { DiagnosticInfo },
-    LspDiagnosticsVirtualTextInformation { fg = DiagnosticInfo.fg.darken(20) },
-    LspDiagnosticsSignInformation        { DiagnosticInfo },
+    DiagnosticInfo             { MoreMsg },
+    DiagnosticFloatingInfo     { DiagnosticInfo },
+    DiagnosticVirtualTextInfo  { fg = DiagnosticInfo.fg.darken(40), bg = DiagnosticInfo.fg.darken(90) },
+    DiagnosticSignInformation  { DiagnosticInfo },
 
-    DiagnosticHint                       { Normal },
-    LspDiagnosticsHint                   { DiagnosticHint },
-    LspDiagnosticsFloatingHint           { DiagnosticHint },
-    LspDiagnosticsVirtualTextHint        { fg = DiagnosticHint.fg.darken(40) },
-    LspDiagnosticsSignHint               { DiagnosticHint },
+    DiagnosticHint             { fg = hsl(p.normal.white) },
+    DiagnosticFloatingHint     { DiagnosticHint },
+    DiagnosticVirtualTextHint  { fg = DiagnosticHint.fg.darken(20), bg = DiagnosticHint.fg.darken(80) },
+    DiagnosticSignHint         { DiagnosticHint },
 
     -- LspDiagnosticsUnderlineError {},
     -- LspDiagnosticsUnderlineWarning {},
@@ -292,8 +288,8 @@ return lush(function()
     -- }}}
 
     -- nvim-lightbulb {{{
-    LightBulbFloatWin { LspDiagnosticsFloatingHint },
-    LightBulbVirtualText { LspDiagnosticsVirtualTextHint },
+    LightBulbFloatWin { DiagnosticFloatingHint },
+    LightBulbVirtualText { DiagnosticVirtualTextHint },
     -- }}}
 
     CompeDocumentation { NormalFloat },
diff --git a/.vim/lua/lsp.lua b/.vim/lua/lsp.lua
index eb31b94..d9958b0 100644
--- a/.vim/lua/lsp.lua
+++ b/.vim/lua/lsp.lua
@@ -92,17 +92,6 @@ local setup = function()
   -- spinner_lsp.init_capabilities(caps)
 
   -- handler overwrites
-  -- configure builtin diagnositics
-  vim.lsp.handlers['textDocument/publishDiagnostics'] = vim.lsp.with( -- {{{
-    vim.lsp.diagnostic.on_publish_diagnostics, {
-      virtual_text     = false,
-      signs            = true,
-      underline        = true,
-      update_in_insert = false,
-    }
-  )
-  -- }}}
-
   -- overwrite codeAction handler to not ask for confirmation if only a single
   -- action is given
   vim.lsp.handlers['textDocument/codeAction'] = function(_, _, actions) -- {{{
@@ -147,13 +136,6 @@ local setup = function()
   end
   -- }}}
 
-  vim.fn.sign_define({
-    {name='LspDiagnosticsSignError', text='⚡', numhl='Error'},
-    {name='LspDiagnosticsSignWarning', text='⯈', numhl='Warning'},
-    {name='LspDiagnosticsSignInformation', text='ℹ'},
-    {name='LspDiagnosticsSignHint', text='🞶'}
-  })
-
   lsp.ccls.setup {
     on_attach = my_attach,
     on_exit = my_exit,
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 8b262b9..883bd1b 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -431,6 +431,8 @@ return require('packer').startup({function()
           })
         end)
 
+      vim.keymap.set('n', ';d', require('telescope.builtin').diagnostics)
+
       -- LSP stuff
       vim.keymap.set('n', ';s', require('telescope.builtin').lsp_workspace_symbols)
       vim.keymap.set('n', ';a', require('telescope.builtin').lsp_code_actions)