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: handle context-commentstring setup (#4451)

Browse source
This commit is contained in:
José Olórtegui 2024-05-14 03:37:33 -04:00 committed by GitHub
parent d8ffab83be
commit 38216e6701
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: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,14 +102,24 @@ function M.setup()
return
end
local status_ok, treesitter_configs = pcall(require, "nvim-treesitter.configs")
if not status_ok then
local ts_status_ok, treesitter_configs = pcall(require, "nvim-treesitter.configs")
if not ts_status_ok then
Log:error "Failed to load nvim-treesitter.configs"
return
end
local status_ok, ts_context_commentstring = pcall(require, "ts_context_commentstring")
if not status_ok then
Log:error "Failed to load ts_context_commentstring"
return
end
local opts = vim.deepcopy(lvim.builtin.treesitter)
-- handle deprecated API, https://github.com/JoosepAlviste/nvim-ts-context-commentstring/issues/82
ts_context_commentstring.setup(opts.context_commentstring)
opts.context_commentstring = nil
treesitter_configs.setup(opts)
if lvim.builtin.treesitter.on_config_done then

4
snapshots/default.json
View file

@ -87,10 +87,10 @@
"commit": "64f61e4"
},
"nvim-treesitter": {
"commit": "1e64838"
"commit": "d5a1c2b"
},
"nvim-ts-context-commentstring": {
"commit": "b8ff464"
"commit": "0bdccb9"
},
"nvim-web-devicons": {
"commit": "5b90678"