From 068dfcd4b940676c57dc913a67525faa1cf75593 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Sat, 2 Oct 2021 18:11:15 +0530
Subject: [PATCH] nvim: lsp/keymappings: Move the diagnostic key mappings
 outside of LSP

vim.diagnostic framework is now available and can be used outside of
LSP. This means the same functions can now work for plugins providing
diagnostics via this framework like nvim-lint and null-ls.
---
 nvim/.config/nvim/lua/keymappings.lua | 9 +++++++++
 nvim/.config/nvim/lua/lsp.lua         | 7 -------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nvim/.config/nvim/lua/keymappings.lua b/nvim/.config/nvim/lua/keymappings.lua
index 713d198..ebde8dd 100644
--- a/nvim/.config/nvim/lua/keymappings.lua
+++ b/nvim/.config/nvim/lua/keymappings.lua
@@ -137,3 +137,12 @@ remap('n', 'gm', '`', { noremap = false })
 remap('n', '<Leader>mc', ':norm `.<CR>' , opts)
 remap('n', '<Leader>mi', ':norm `^<CR>' , opts)
 remap('n', '<Leader>mj', ':norm `\'<CR>', opts)
+
+remap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev { wrap = false }<CR>' , opts)
+remap('n', ']d', '<cmd>lua vim.diagnostic.goto_next { wrap = false }<CR>' , opts)
+remap('n', '[D', '<cmd>lua vim.diagnostic.goto_prev()<CR>'                , opts)
+remap('n', ']D', '<cmd>lua vim.diagnostic.goto_next()<CR>'                , opts)
+remap('n', 'dl', '<cmd>lua vim.diagnostic.setloclist()<CR>'               , opts)
+remap('n', 'dq', '<cmd>lua vim.diagnostic.setqflist()<CR>'                , opts)
+remap('n', ',D', '<cmd>lua vim.diagnostic.show_line_diagnostics()<CR>'    , opts)
+remap('n', ',d', '<cmd>lua vim.diagnostic.show_position_diagnostics()<CR>', opts)
diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
index 0e53703..1a4e7ed 100644
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -118,13 +118,6 @@ local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gR'       , '<cmd>lua vim.lsp.buf.rename()<CR>'          , opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', 'pd'       , '<cmd>lua PeekDefinition()<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)
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', ',d', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>'   , opts)
-
   if client.resolved_capabilities.document_range_formatting then
     vim.api.nvim_buf_set_keymap(bufnr, 'x', 'gq', '<cmd>lua format_range_operator()<CR>', opts)
   end