From 2383eb70755ce72e0375169051309c01dd33c480 Mon Sep 17 00:00:00 2001 From: jdhao Date: Sun, 16 Feb 2025 21:03:17 +0100 Subject: [PATCH] switch back to nvim-cmp (#381) --- lua/config/lsp.lua | 2 +- lua/plugin_specs.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua index f2c8492..1496010 100644 --- a/lua/config/lsp.lua +++ b/lua/config/lsp.lua @@ -117,7 +117,7 @@ local custom_attach = function(client, bufnr) end end -local capabilities = require("cmp_nvim_lsp").default_capabilities() +local capabilities = vim.lsp.protocol.make_client_capabilities() -- required by nvim-ufo capabilities.textDocument.foldingRange = { diff --git a/lua/plugin_specs.lua b/lua/plugin_specs.lua index 9342b6d..6f6faa1 100644 --- a/lua/plugin_specs.lua +++ b/lua/plugin_specs.lua @@ -23,7 +23,7 @@ end local plugin_specs = { -- auto-completion engine { - "iguanacucumber/magazine.nvim", + "hrsh7th/nvim-cmp", name = "nvim-cmp", -- event = 'InsertEnter', event = "VeryLazy", @@ -39,6 +39,7 @@ local plugin_specs = { require("config.nvim-cmp") end, }, + { "neovim/nvim-lspconfig", event = { "BufRead", "BufNewFile" }, @@ -385,7 +386,7 @@ local plugin_specs = { end return false end, - build = "cd app && npm install", + build = "cd app && npm install && git restore .", ft = { "markdown" }, },