From e3a6774b762f3d2cbd90200a9349f3915d331dcb Mon Sep 17 00:00:00 2001
From: Oliver Hartmann <oliver.hartmann@freiewildbahn.de>
Date: Wed, 16 Mar 2022 23:55:26 +0100
Subject: [PATCH] Added clangd_extensions

---
 lua/my_plugins.lua       |  5 ++++-
 lua/setup/cmp.lua        | 12 ++++++++++++
 lua/setup/lspinstall.lua | 10 +++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/lua/my_plugins.lua b/lua/my_plugins.lua
index a4bac2f..571da20 100644
--- a/lua/my_plugins.lua
+++ b/lua/my_plugins.lua
@@ -109,7 +109,10 @@ return require('packer').startup(function()
   use({ 's1n7ax/nvim-terminal' })
   use({
     'williamboman/nvim-lsp-installer',
-    requires = { 'neovim/nvim-lspconfig' },
+    requires = {
+      'neovim/nvim-lspconfig',
+      '/p00f/clangd_extensions.nvim',
+    },
     config = get_setup('lspinstall'),
   })
   use({
diff --git a/lua/setup/cmp.lua b/lua/setup/cmp.lua
index 6c9604d..cfc0ecd 100644
--- a/lua/setup/cmp.lua
+++ b/lua/setup/cmp.lua
@@ -83,6 +83,18 @@ cmp.setup({
     { name = 'emoji' },
   },
   completion = { completeopt = 'menu,menuone,noinsert, noselect' },
+  sorting = {
+    comparators = {
+      cmp.config.compare.offset,
+      cmp.config.compare.exact,
+      cmp.config.compare.recently_used,
+      require("clangd_extensions.cmp_scores"),
+      cmp.config.compare.kind,
+      cmp.config.compare.sort_text,
+      cmp.config.compare.length,
+      cmp.config.compare.order,
+    },
+  },
   -- experimental = { native_menu = true }
 })
 
diff --git a/lua/setup/lspinstall.lua b/lua/setup/lspinstall.lua
index 2cc3532..977c111 100644
--- a/lua/setup/lspinstall.lua
+++ b/lua/setup/lspinstall.lua
@@ -116,7 +116,7 @@ lsp_installer.on_server_ready(function(server)
 
   -- (optional) Customize the options passed to the server
   if server.name == 'clangd' then
-    opts.cmd = { 'clangd', '--compile-commands-dir=build_nvim' }
+    return
   end
 
   -- This setup() function is exactly the same as lspconfig's setup function (:help lspconfig-quickstart)
@@ -139,3 +139,11 @@ null_ls.setup({
   capabilities = capabilities,
 })
 vim.diagnostic.config({ virtual_text = false })
+
+require('clangd_extensions').setup({
+  server = {
+    on_attach = on_attach,
+    capabilities = capabilities,
+    cmd = { 'clangd', '--compile-commands-dir=build_nvim' }
+  },
+})