Mirrors/LunarVim
Mirrors/LunarVim
1
0
Fork 0
mirror of https://github.com/LunarVim/LunarVim.git synced 2024-09-20 10:35:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(cmp): handle deprecated tree-sitter api (#3853)

Browse source
This commit is contained in:
kylo252 2023-02-16 16:51:35 +01:00 committed by GitHub
parent 28b4b8d8a6
commit ddc86f3a8a
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lua/lvim/core/autopairs.lua
View file

@ -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)

5
lua/lvim/core/treesitter.lua
View file

@ -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

1
lua/lvim/plugins.lua
View file

@ -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