From 50a5d55fe4897f59755c8e15712262a8ed97342c Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Sat, 21 Nov 2020 11:05:07 +0530
Subject: [PATCH] nvim: Update for nvim LSP diagnostics

The diagnostic-nvim plugin got merged upstream and as a result the
plugin is not required anymore. LSP diagnostic highlight group names
were also updated.

See the below issues for notes on migration.
https://github.com/neovim/neovim/pull/12655
https://github.com/nvim-lua/diagnostic-nvim/issues/73
---
 nvim/.config/nvim/colors/yolokai.vim         | 38 +++++++++++---------
 nvim/.config/nvim/lua/lsp.lua                | 11 +++---
 nvim/.config/nvim/lua/modules/diagnostic.lua |  4 ---
 nvim/.config/nvim/lua/plugins.lua            |  4 ---
 4 files changed, 26 insertions(+), 31 deletions(-)
 delete mode 100644 nvim/.config/nvim/lua/modules/diagnostic.lua

diff --git a/nvim/.config/nvim/colors/yolokai.vim b/nvim/.config/nvim/colors/yolokai.vim
index dc18f3b..1f99d79 100644
--- a/nvim/.config/nvim/colors/yolokai.vim
+++ b/nvim/.config/nvim/colors/yolokai.vim
@@ -181,27 +181,31 @@ local highlight_groups = {
 	Question   = {bg=black,  fg=yellow,       style='underline'},
 
 	--[[ 4.2.11. LSP ]]
-	LspDiagnosticsError         = 'Error'   ,
-	LspDiagnosticsErrorFloating = 'ErrorMsg',
-	LspDiagnosticsErrorSign     = 'ErrorMsg',
+	LspDiagnosticsDefaultError  = 'Error'   ,
+	LspDiagnosticsFloatingError = 'ErrorMsg',
+	LspDiagnosticsSignError     = 'ErrorMsg',
 
-	LspDiagnosticsWarning         = 'Warning'   ,
-	LspDiagnosticsWarningFloating = 'WarningMsg',
-	LspDiagnosticsWarningSign     = 'WarningMsg',
+	LspDiagnosticsDefaultWarning  = 'Warning'   ,
+	LspDiagnosticsFloatingWarning = 'WarningMsg',
+	LspDiagnosticsSignWarning     = 'WarningMsg',
 
-	LspDiagnosticsHint         = 'Hint'   ,
-	LspDiagnosticsHintFloating = 'HintMsg',
-	LspDiagnosticsHintSign     = 'HintMsg',
+	LspDiagnosticsDefaultHint  = 'Hint'   ,
+	LspDiagnosticsFloatingHint = 'HintMsg',
+	LspDiagnosticsSignHint     = 'HintMsg',
 
-	LspDiagnosticsInformation         = 'Info'   ,
-	LspDiagnosticsInformationFloating = 'InfoMsg',
-	LspDiagnosticsInformationSign     = 'InfoMsg',
+	LspDiagnosticsDefaultInformation  = 'Info'   ,
+	LspDiagnosticsFloatingInformation = 'InfoMsg',
+	LspDiagnosticsSignInformation     = 'InfoMsg',
 
-	LspDiagnosticsUnderline        = {style={'undercurl', color=white}},
-	LspDiagnosticsUnderlineError   = {style={'undercurl', color=red}},
-	LspDiagnosticsUnderlineHint    = {style={'undercurl', color=purple}},
-	LspDiagnosticsUnderlineInfo    = {style={'undercurl', color=pink}},
-	LspDiagnosticsUnderlineWarning = {style={'undercurl', color=red}},
+	LspDiagnosticsUnderlineError       = {style={'undercurl', color=red}},
+	LspDiagnosticsUnderlineHint        = {style={'undercurl', color=purple}},
+	LspDiagnosticsUnderlineInformation = {style={'undercurl', color=pink}},
+	LspDiagnosticsUnderlineWarning     = {style={'undercurl', color=red}},
+
+	LspDiagnosticsVirtualTextError       = {color=red},
+	LspDiagnosticsVirtualTextHint        = {color=purple},
+	LspDiagnosticsVirtualTextInformation = {color=pink},
+	LspDiagnosticsVirtualTextWarning     = {color=red},
 
 	--[[ 4.2.12. Cursor ]]
 	Cursor   = {bg=white,          fg=black, style='inverse'},
diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
index 1966daf..3e33d50 100644
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -1,5 +1,4 @@
 local nvim_lsp = require('lspconfig')
-local diagnostic = require('diagnostic')
 local completion = require('completion')
 local lsp_status = require('lsp-status')
 
@@ -47,7 +46,6 @@ end
 
 local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-  diagnostic.on_attach(client, bufnr)
   completion.on_attach(client, bufnr)
   lsp_status.on_attach(client, bufnr)
 
@@ -65,10 +63,11 @@ local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<Leader>de', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<Leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'pd', '<cmd>lua peek_definition()<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '[d', ':PrevDiagnostic<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', ']d', ':NextDiagnostic<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '[D', ':PrevDiagnosticCycle<CR>', opts)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', ']D', ':NextDiagnosticCycle<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev { wrap = false }<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next { wrap = false }<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '[D', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', ']D', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'do', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
 end
 
 local servers = { 'hls', 'rust_analyzer' }
diff --git a/nvim/.config/nvim/lua/modules/diagnostic.lua b/nvim/.config/nvim/lua/modules/diagnostic.lua
deleted file mode 100644
index dc7fdc6..0000000
--- a/nvim/.config/nvim/lua/modules/diagnostic.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-vim.g.diagnostic_enable_virtual_text = 0
-vim.g.diagnostic_show_sign = 1
-vim.g.diagnostic_auto_popup_while_jump = 1
-vim.g.diagnostic_insert_delay = 1
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index c642111..6df0615 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -122,10 +122,6 @@ local init = function ()
     'neovim/nvim-lspconfig',
     config = "require('lsp')",
   }
-  use {
-    'nvim-lua/diagnostic-nvim',
-    config = "require('modules.diagnostic')"
-  }
   use 'nvim-lua/lsp-status.nvim'
   -- Language support & syntax highlighting
   -- Haskell