From 9bb11d975fe7f9ff9ed44d5ead58072d8efae6e5 Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim.huizinga@gmail.com>
Date: Thu, 23 Dec 2021 22:57:02 +0100
Subject: [PATCH] Improved diagnostic popup and added some keybindings

---
 nvim/.config/nvim/init.vim        |  2 ++
 nvim/.config/nvim/lua/plugins.lua | 57 +++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 6e7dab9..756d0a2 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -73,10 +73,12 @@ nnoremap <leader>ff <cmd>Telescope find_files<cr>
 nnoremap <leader>fg <cmd>Telescope live_grep<cr>
 nnoremap <leader>fb <cmd>Telescope buffers<cr>
 nnoremap <leader>lc <cmd>Telescope lsp_code_actions<cr>
+nnoremap <leader>ls <cmd>Telescope lsp_document_symbols<cr>
 map <silent> <leader>ln :lua vim.lsp.diagnostic.goto_next()<cr>
 map <silent> <leader>lp :lua vim.lsp.diagnostic.goto_prev()<cr>
 map <leader>ll :lua vim.lsp.buf.
 map <silent> <leader>lh :lua vim.lsp.buf.hover()<cr>
+map <silent> <leader>lf :lua vim.lsp.buf.formatting()<cr>
 
 let g:closetag_filenames = "*.html,*.xhtml,*.phtml,*.erb,*.jsx,*.tsx"
 let g:closetag_xhtml_filenames = '*.xhtml,*.jsx,*.tsx,*.erb'
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 94dd820..fa794a6 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -42,14 +42,14 @@ require('packer').startup(function()
 	use 'cespare/vim-toml'
 end)
 
+--Remap for dealing with word wrap
+vim.api.nvim_set_keymap('n', 'k', "v:count == 0 ? 'gk' : 'k'", { noremap = true, expr = true, silent = true })
+vim.api.nvim_set_keymap('n', 'j', "v:count == 0 ? 'gj' : 'j'", { noremap = true, expr = true, silent = true })
+
 require('telescope').setup{ defaults = { file_ignore_patterns = { "node_module" } } }
 
 local nvim_lsp = require('lspconfig')
 
--- Add additional capabilities supported by nvim-cmp
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
-
 vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
 	vim.lsp.diagnostic.on_publish_diagnostics, {
 		virtual_text = {
@@ -61,9 +61,44 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
 )
 
 vim.o.updatetime = 250
-vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.lsp.diagnostic.show_line_diagnostics({focusable=false})]]
+
+-- Taken from: https://github.com/wookayin/dotfiles/blob/master/nvim/lua/config/lsp.lua
+-- Makes it so the diagnostic popup does not keep overwriting other popups
+vim.diagnostic.config({
+	virtual_text = false,
+	float = {
+		focusable = false,   -- See neovim#16425
+	},
+})
+_G.LspDiagnosticsShowPopup = function()
+	return vim.diagnostic.open_float(0, {scope="cursor"})
+end
+
+-- Show diagnostics in a pop-up window on hover
+_G.LspDiagnosticsPopupHandler = function()
+  local current_cursor = vim.api.nvim_win_get_cursor(0)
+  local last_popup_cursor = vim.w.lsp_diagnostics_last_cursor or {nil, nil}
+
+  -- Show the popup diagnostics window,
+  -- but only once for the current cursor location (unless moved afterwards).
+  if not (current_cursor[1] == last_popup_cursor[1] and current_cursor[2] == last_popup_cursor[2]) then
+    vim.w.lsp_diagnostics_last_cursor = current_cursor
+    local _, winnr = _G.LspDiagnosticsShowPopup()
+  end
+end
+vim.cmd [[
+augroup LSPDiagnosticsOnHover
+  autocmd!
+  autocmd CursorHold *   lua _G.LspDiagnosticsPopupHandler()
+augroup END
+]]
+
+vim.cmd [[autocmd CursorHoldI * lua vim.lsp.buf.signature_help()]]
 
 -- Enable some language servers with the additional completion capabilities offered by nvim-cmp
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
+
 local servers = { 'clangd', 'tsserver', 'gopls', 'pylsp' }
 for _, lsp in ipairs(servers) do
 	nvim_lsp[lsp].setup {
@@ -77,14 +112,6 @@ vim.fn.sign_define("LspDiagnosticsSignWarning", { text="" })
 vim.fn.sign_define("LspDiagnosticsSignInformation", { text="" })
 vim.fn.sign_define("LspDiagnosticsSignHint", { text="" })
 
--- require 'lsp_signature'.setup({
--- 	bind =  true,
--- 	hint_enable = false,
--- 	handler_opts = {
--- 		border = "none"
--- 	}
--- })
-
 -- Set completeopt to have a better completion experience
 vim.o.completeopt = 'menuone,noselect'
 
@@ -114,7 +141,7 @@ cmp.setup {
 			if cmp.visible() then
 				cmp.select_next_item()
 			elseif luasnip.expand_or_jumpable() then
-				vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<Plug>luasnip-expand-or-jump', true, true, true), '')
+				luasnip.expand_or_jump()
 			else
 				fallback()
 			end
@@ -123,7 +150,7 @@ cmp.setup {
 			if cmp.visible() then
 				cmp.select_prev_item()
 			elseif luasnip.jumpable(-1) then
-				vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<Plug>luasnip-jump-prev', true, true, true), '')
+				luasnip.jump(-1)
 			else
 				fallback()
 			end