From 8d6d4b5c738e2407cc7b66e19d6e01ff7ea2e671 Mon Sep 17 00:00:00 2001
From: Oliver Hartmann <oliver.hartmann@freiewildbahn.de>
Date: Fri, 10 Sep 2021 23:46:00 +0200
Subject: [PATCH] Own configuration file for lsp and some small fixes

---
 init.lua            | 102 ++------------------------------------------
 lua/keymappings.lua |   2 +-
 lua/mylsp.lua       |  82 +++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 100 deletions(-)
 create mode 100644 lua/mylsp.lua

diff --git a/init.lua b/init.lua
index 7757a9e..a126cd5 100644
--- a/init.lua
+++ b/init.lua
@@ -75,111 +75,15 @@ utils.map('n', '<leader>b', '<cmd>Telescope buffers<cr>')
 utils.map('n', '<space>r', '<cmd>Telescope lsp_references<cr>')
 utils.map('n', '<C-S-o>', '<cmd>Telescope lsp_document_symbols<cr>')
 utils.map('n', '<A-m>', '<cmd>Telescope lsp_document_symbols<cr>')
+utils.map('n', '<space>v', '<cmd>Telescope lsp_document_diagnostics<cr>')
 -------------------- LSP -----------------------------------
-local nvim_lsp = require 'lspconfig'
-
--- We use the default settings for ccls and pylsp: the option table can stay empty
-nvim_lsp.ccls.setup {}
-nvim_lsp.pyright.setup{}
-nvim_lsp.clangd.setup{}
-
-utils.map('n', '<space>,', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>')
-utils.map('n', '<space>;', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>')
-utils.map('n', '<space>a', '<cmd>lua vim.lsp.buf.code_action()<CR>')
-utils.map('n', '<space>d', '<cmd>lua vim.lsp.buf.definition()<CR>')
-utils.map('n', '<space>e', '<cmd>lua vim.lsp.buf.declaration()<CR>')
-utils.map('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>')
-utils.map('v', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>')
-utils.map('n', '<space>h', '<cmd>lua vim.lsp.buf.hover()<CR>')
-utils.map('n', '<space>m', '<cmd>lua vim.lsp.buf.rename()<CR>')
--- utils.map('n', '<space>r', '<cmd>lua vim.lsp.buf.references()<CR>')
-utils.map('n', '<space>s', '<cmd>lua vim.lsp.buf.document_symbol()<CR>')
-utils.map('n', '<C-t>', '<cmd>lua vim.lsp.buf.workspace_symbol()<CR>')
-utils.map('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
-utils.map('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
-
-utils.map('n', '<A-o>', ':ClangdSwitchSourceHeader<CR>')
-
--- Add additional capabilities supported by nvim-cmp
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities.textDocument.completion.completionItem.documentationFormat = { 'markdown', 'plaintext' }
-capabilities.textDocument.completion.completionItem.snippetSupport = true
-capabilities.textDocument.completion.completionItem.preselectSupport = true
-capabilities.textDocument.completion.completionItem.insertReplaceSupport = true
-capabilities.textDocument.completion.completionItem.labelDetailsSupport = true
-capabilities.textDocument.completion.completionItem.deprecatedSupport = true
-capabilities.textDocument.completion.completionItem.commitCharactersSupport = true
-capabilities.textDocument.completion.completionItem.tagSupport = { valueSet = { 1 } }
-capabilities.textDocument.completion.completionItem.resolveSupport = {
-  properties = {
-    'documentation',
-    'detail',
-    'additionalTextEdits',
-  },
-}
-
-local on_attach = function(client, bufnr)
-  local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
-  local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
-
-  buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-  -- Mappings.
-  local opts = { noremap=true, silent=true }
-  buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-  buf_set_keymap('n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
-  buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
-  buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-  buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-  buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-  buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-  buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-  buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-  buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-  buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-  buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-  buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
-  buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
-  buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
-  buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
-
-  -- Set some keybinds conditional on server capabilities
-  if client.resolved_capabilities.document_formatting then
-    buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
-  end
-  if client.resolved_capabilities.document_range_formatting then
-    buf_set_keymap("v", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
-  end
-
-  -- Set autocommands conditional on server_capabilities
-  if client.resolved_capabilities.document_highlight then
-    vim.api.nvim_exec([[
-      hi LspReferenceRead cterm=bold ctermbg=red guibg=DarkGreen
-      hi LspReferenceText cterm=bold ctermbg=Black guibg=DarkYellow guifg=Black
-      hi LspReferenceWrite cterm=bold ctermbg=red guibg=DarkRed
-      augroup lsp_document_highlight
-        autocmd! * <buffer>
-        autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
-        autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()
-        autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
-      augroup END
-    ]], false)
-  end
-end
-
--- Enable some language servers with the additional completion capabilities offered by nvim-cmp
-local servers = { 'clangd', 'pyright', 'rust_analyzer', 'tsserver' }
-for _, lsp in ipairs(servers) do
-  nvim_lsp[lsp].setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-  }
-end
+require('mylsp')
 
 -------------------- GITSIGNS ------------------------------
 -- require('gitsigns').setup()
 -------------------- LIGHTBULB -----------------------------
 require('nvim-lightbulb').update_lightbulb()
+vim.cmd [[autocmd CursorHold,CursorHoldI * lua require'nvim-lightbulb'.update_lightbulb()]]
 -------------------- CMP -----------------------------------
 require('cmp_plug')
 -------------------- NVIM-TREE -----------------------------
diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 1c69c98..545d995 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -32,4 +32,4 @@ utils.map('i', '<S-F2>', '<Esc>:split .<CR>')
 
 utils.map('n', '<C-S>', ':wa<CR>')
 
-utils.map('n', '<Space>', '<Nop>')
+
diff --git a/lua/mylsp.lua b/lua/mylsp.lua
new file mode 100644
index 0000000..15433fc
--- /dev/null
+++ b/lua/mylsp.lua
@@ -0,0 +1,82 @@
+local nvim_lsp = require 'lspconfig'
+local utils = require('utils')
+
+-- We use the default settings for ccls and pylsp: the option table can stay empty
+nvim_lsp.ccls.setup {}
+nvim_lsp.pyright.setup{}
+nvim_lsp.clangd.setup{}
+
+
+-- Add additional capabilities supported by nvim-cmp
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.documentationFormat = { 'markdown', 'plaintext' }
+capabilities.textDocument.completion.completionItem.snippetSupport = true
+capabilities.textDocument.completion.completionItem.preselectSupport = true
+capabilities.textDocument.completion.completionItem.insertReplaceSupport = true
+capabilities.textDocument.completion.completionItem.labelDetailsSupport = true
+capabilities.textDocument.completion.completionItem.deprecatedSupport = true
+capabilities.textDocument.completion.completionItem.commitCharactersSupport = true
+capabilities.textDocument.completion.completionItem.tagSupport = { valueSet = { 1 } }
+capabilities.textDocument.completion.completionItem.resolveSupport = {
+  properties = {
+    'documentation',
+    'detail',
+    'additionalTextEdits',
+  },
+}
+
+local on_attach = function(client, bufnr)
+  local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+  local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
+
+  buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+  -- Mappings.
+  local opts = { noremap=true, silent=true }
+  utils.map('n', '<space>,', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>')
+  utils.map('n', '<space>;', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>')
+  utils.map('n', '<space>a', '<cmd>lua vim.lsp.buf.code_action()<CR>')
+  utils.map('n', '<space>d', '<cmd>lua vim.lsp.buf.definition()<CR>')
+  utils.map('n', '<space>e', '<cmd>lua vim.lsp.buf.declaration()<CR>')
+  utils.map('n', '<space>h', '<cmd>lua vim.lsp.buf.hover()<CR>')
+  utils.map('n', '<space>m', '<cmd>lua vim.lsp.buf.rename()<CR>')
+  -- utils.map('n', '<space>r', '<cmd>lua vim.lsp.buf.references()<CR>')
+  utils.map('n', '<space>s', '<cmd>lua vim.lsp.buf.document_symbol()<CR>')
+  utils.map('n', '<C-t>', '<cmd>lua vim.lsp.buf.workspace_symbol()<CR>')
+  utils.map('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
+  utils.map('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
+
+  utils.map('n', '<A-o>', ':ClangdSwitchSourceHeader<CR>')
+
+  -- Set some keybinds conditional on server capabilities
+  if client.resolved_capabilities.document_formatting then
+    utils.map('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>')
+  end
+  if client.resolved_capabilities.document_range_formatting then
+    utils.map('v', '<space>f', '<cmd>lua vim.lsp.buf.range_formatting()<CR>')
+  end
+
+  -- Set autocommands conditional on server_capabilities
+  if client.resolved_capabilities.document_highlight then
+    vim.api.nvim_exec([[
+      hi LspReferenceRead cterm=bold ctermbg=red guibg=DarkGreen
+      hi LspReferenceText cterm=bold ctermbg=Black guibg=DarkYellow guifg=Black
+      hi LspReferenceWrite cterm=bold ctermbg=red guibg=DarkRed
+      augroup lsp_document_highlight
+        autocmd! * <buffer>
+        autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
+        autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()
+        autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
+      augroup END
+    ]], false)
+  end
+end
+
+-- Enable some language servers with the additional completion capabilities offered by nvim-cmp
+local servers = { 'clangd', 'pyright', 'rust_analyzer', 'tsserver' }
+for _, lsp in ipairs(servers) do
+  nvim_lsp[lsp].setup {
+    on_attach = on_attach,
+    capabilities = capabilities,
+  }
+end