fix bug in lsp handlers

Signed-off-by: Micah Halter <micah@balena.io>
AstroNvim · Apr 10, 2022 · 50f8841 · 50f8841
1 parent 11ce851
commit 50f8841
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/lua/configs/lsp/handlers.lua b/lua/configs/lsp/handlers.lua
@@ -76,13 +76,11 @@ M.on_attach = function(client, bufnr)
   lsp_highlight_document(client)
 end
 
-local capabilities = vim.lsp.protocol.make_client_capabilities()
+M.capabilities = vim.lsp.protocol.make_client_capabilities()
 
 local status_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
-if not status_ok then
-  return
+if status_ok then
+  M.capabilities = cmp_nvim_lsp.update_capabilities(M.capabilities)
 end
 
-M.capabilities = cmp_nvim_lsp.update_capabilities(capabilities)
-
 return M
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
@@ -173,7 +173,7 @@ local astro_plugins = {
   -- Completion engine
   {
     "hrsh7th/nvim-cmp",
-    event = "InsertEnter",
+    event = { "BufRead", "BufNewFile" },
     config = function()
       require("configs.cmp").config()
     end,
@@ -206,7 +206,6 @@ local astro_plugins = {
   -- LSP manager
   {
     "williamboman/nvim-lsp-installer",
-    event = { "BufRead", "BufNewFile" },
     cmd = {
       "LspInstall",
       "LspInstallInfo",
@@ -222,7 +221,7 @@ local astro_plugins = {
   -- Built-in LSP
   {
     "neovim/nvim-lspconfig",
-    event = "BufWinEnter",
+    after = "cmp-nvim-lsp",
     config = function()
       require "configs.lsp"
     end,