diff options
| -rw-r--r-- | lua/lvim/core/autopairs.lua | 9 | ||||
| -rw-r--r-- | lua/lvim/core/treesitter.lua | 5 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/lua/lvim/core/autopairs.lua b/lua/lvim/core/autopairs.lua index b9b66683..a3e0d594 100644 --- a/lua/lvim/core/autopairs.lua +++ b/lua/lvim/core/autopairs.lua @@ -46,10 +46,6 @@ function M.config() } end -local function on_confirm_done(...) - require("nvim-autopairs.completion.cmp").on_confirm_done()(...) -end - M.setup = function() local status_ok, autopairs = pcall(require, "nvim-autopairs") if not status_ok then @@ -74,8 +70,11 @@ M.setup = function() if lvim.builtin.autopairs.on_config_done then lvim.builtin.autopairs.on_config_done(autopairs) end + pcall(function() - require "nvim-autopairs.completion.cmp" + local function on_confirm_done(...) + require("nvim-autopairs.completion.cmp").on_confirm_done()(...) + end require("cmp").event:off("confirm_done", on_confirm_done) require("cmp").event:on("confirm_done", on_confirm_done) end) diff --git a/lua/lvim/core/treesitter.lua b/lua/lvim/core/treesitter.lua index a213b9d3..626206a9 100644 --- a/lua/lvim/core/treesitter.lua +++ b/lua/lvim/core/treesitter.lua @@ -115,6 +115,11 @@ function M.setup() if lvim.builtin.treesitter.on_config_done then lvim.builtin.treesitter.on_config_done(treesitter_configs) end + + -- handle deprecated API, https://github.com/windwp/nvim-autopairs/pull/324 + local ts_utils = require "nvim-treesitter.ts_utils" + ts_utils.is_in_node_range = vim.treesitter.is_in_node_range + ts_utils.get_node_range = vim.treesitter.get_node_range end return M diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 61aeb221..3f8cb62c 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -117,6 +117,7 @@ local core_plugins = { require("lvim.core.autopairs").setup() end, enabled = lvim.builtin.autopairs.active, + dependencies = { "nvim-treesitter/nvim-treesitter", "hrsh7th/nvim-cmp" }, }, -- Treesitter |