From 5d2510107701aab726ba011fd3b9cc258968820d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kmie=C4=87?= <KmcR@viessmann.com>
Date: Tue, 12 Apr 2022 01:13:58 +0200
Subject: [PATCH] Nvim: switch to clangd and clangd_extensions

---
 .config/nvim/after/plugin/lspconfig.rc.vim | 52 ++++++++++++++--------
 .config/nvim/init.vim                      |  6 +--
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/.config/nvim/after/plugin/lspconfig.rc.vim b/.config/nvim/after/plugin/lspconfig.rc.vim
index fe8dd90..4945b5b 100644
--- a/.config/nvim/after/plugin/lspconfig.rc.vim
+++ b/.config/nvim/after/plugin/lspconfig.rc.vim
@@ -7,6 +7,7 @@ lua << EOF
 local nvim_lsp = require'lspconfig'
 local coq = require'coq'
 local cmp = require'cmp_nvim_lsp'
+local clangd_extensions = require("clangd_extensions")
 --local signature = require'lsp_signature'
 
 -- Mappings.
@@ -84,25 +85,38 @@ nvim_lsp.groovyls.setup (
   })
 )
 
-nvim_lsp.ccls.setup(
-  coq.lsp_ensure_capabilities({
-    init_options = {
-      compilationDatabaseDirectory = ".";
-      index = {
-        threads = 0;
-      },
-      clang = {
-        excludeArgs = { "-frounding-math"} ;
-      },
-    },
-    on_attach = on_attach,
-    on_publish_diagnostics = diagnostic_handler,
-    capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()),
-    flags = {
-      debounce_text_changes = 150,
-    }}
-  )
-)
+-- nvim_lsp.ccls.setup(
+--   coq.lsp_ensure_capabilities({
+--     init_options = {
+--       compilationDatabaseDirectory = ".";
+--       index = {
+--         threads = 0;
+--       },
+--       clang = {
+--         excludeArgs = { "-frounding-math"} ;
+--       },
+--     },
+--     root_dir = nvim_lsp.util.root_pattern("compile_commands.json"),
+--     on_attach = on_attach,
+--     on_publish_diagnostics = diagnostic_handler,
+--     capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()),
+--     flags = {
+--       debounce_text_changes = 150,
+--     }}
+--   )
+-- )
+
+clangd_extensions.setup()
+-- nvim_lsp.clangd.setup(
+--   coq.lsp_ensure_capabilities({
+--     root_dir = nvim_lsp.util.root_pattern("compile_commands.json"),
+--     on_attach = on_attach,
+--     capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()),
+--     flags = {
+--       debounce_text_changes = 150,
+--     }}
+--   )
+-- )
 
 nvim_lsp.pylsp.setup(
   coq.lsp_ensure_capabilities({
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 5b4e7ad..88aa5be 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -13,6 +13,7 @@ call plug#begin('~/.config/nvim/plugins')
 
 " Code development helpers {{{
 Plug 'neovim/nvim-lspconfig'
+Plug 'p00f/clangd_extensions.nvim'
 "Plug 'ray-x/lsp_signature.nvim'
 Plug 'RRethy/vim-illuminate'
 
@@ -90,8 +91,7 @@ Plug 'chrisbra/csv.vim'
 "Plug 'MortenStabenau/matlab-vim'
 Plug 'junegunn/goyo.vim'
 Plug 'lukas-reineke/virt-column.nvim'
-"Plug 'jez/vim-superman' "vman application
-Plug 'glacambre/firenvim'
+"Plug 'glacambre/firenvim'
 "Plug 'JMcKiern/vim-shoot'
 Plug 'mrjones2014/legendary.nvim'
 Plug 'protex/better-digraphs.nvim'
@@ -205,7 +205,7 @@ nmap <space> <leader>
 
 inoremap jj <ESC>
 inoremap jk <ESC>
-inoremap :w<CR> <Esc>:w<CR>
+"inoremap :w<CR> <Esc>:w<CR>
 nnoremap Q <cmd>q
 
 " Reselect visual block after incrementing/decrementing