fix: handle context-commentstring setup (#4451)

LunarVim · May 14, 2024 · 38216e6 · 38216e6
1 parent d8ffab8
commit 38216e6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/lua/lvim/core/treesitter.lua b/lua/lvim/core/treesitter.lua
@@ -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

diff --git a/snapshots/default.json b/snapshots/default.json
@@ -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"