plugin.ts-context-commentstring: Setup as standalone plugin

Ref: JoosepAlviste/nvim-ts-context-commentstring#80
fitrh · Nov 24, 2023 · 2eb7154 · 2eb7154
1 parent ed5d1a5
commit 2eb7154
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/lua/config/plugin/packer.lua b/lua/config/plugin/packer.lua
@@ -1,11 +1,16 @@
 vim.cmd.packadd("packer.nvim")
 
+local function spec(name)
+  return require("config.plugin." .. name .. ".packerspec")
+end
+
 local plugins = {
   { "nvim-lua/plenary.nvim", module = "plenary" },
   { "ray-x/lsp_signature.nvim", module = "lsp_signature" },
   { "b0o/schemastore.nvim", ft = { "json", "jsonc" } },
   require("config.plugin.treesitter.packerspec"),
   require("config.plugin.treesitter-context.packerspec"),
+  spec("ts-context-commentstring"),
   require("config.plugin.lspconfig.packerspec"),
   require("config.plugin.clangd_extensions.packerspec"),
   require("config.plugin.jdtls.packerspec"),

diff --git a/lua/config/plugin/treesitter/packerspec.lua b/lua/config/plugin/treesitter/packerspec.lua
@@ -68,9 +68,5 @@ return {
     "nvim-treesitter/nvim-treesitter-textobjects",
     after = "nvim-treesitter",
   },
-  {
-    "JoosepAlviste/nvim-ts-context-commentstring",
-    after = "nvim-treesitter",
-  },
   { "windwp/nvim-ts-autotag", after = "nvim-treesitter" },
 }
diff --git a/lua/config/plugin/treesitter/setup.lua b/lua/config/plugin/treesitter/setup.lua
@@ -106,9 +106,6 @@ config.setup({
     },
   },
 
-  -- nvim-ts-context-commentstring
-  context_commentstring = { enable = true },
-
   -- nvim-ts-autotag
   autotag = { enable = true },
 })
diff --git a/lua/config/plugin/ts-context-commentstring/packerspec.lua b/lua/config/plugin/ts-context-commentstring/packerspec.lua
@@ -0,0 +1,7 @@
+return {
+  "JoosepAlviste/nvim-ts-context-commentstring",
+  after = "nvim-treesitter",
+  setup = function()
+    vim.api.nvim_set_var("skip_ts_context_commentstring_module", true)
+  end,
+}