fix: contex-ts-commentstring with comment.nvim integration

This commit is contained in:
asep komarudin 2024-02-17 15:27:41 +07:00
parent 6274a2af41
commit aeb724aa07
2 changed files with 31 additions and 25 deletions

View file

@ -182,12 +182,17 @@ return {
{ {
"JoosepAlviste/nvim-ts-context-commentstring", "JoosepAlviste/nvim-ts-context-commentstring",
lazy = true, lazy = true,
event = "InsertEnter", event = "BufWinEnter",
dependencies = "nvim-treesitter/nvim-treesitter", dependencies = "nvim-treesitter/nvim-treesitter",
config = function()
require("ts_context_commentstring").setup({
enable_autocmd = false,
})
end,
}, },
{ {
"numToStr/Comment.nvim", "numToStr/Comment.nvim",
event = "InsertEnter", event = "BufWinEnter",
config = function() config = function()
require("user.comment") require("user.comment")
end, end,
@ -248,7 +253,7 @@ return {
-- for auto close tag -- for auto close tag
{ {
"windwp/nvim-ts-autotag", "windwp/nvim-ts-autotag",
event = "InsertEnter", event = "BufWinEnter",
dependencies = "nvim-treesitter/nvim-treesitter", dependencies = "nvim-treesitter/nvim-treesitter",
config = function() config = function()
require("nvim-ts-autotag").setup() require("nvim-ts-autotag").setup()

View file

@ -4,8 +4,9 @@ if not status_ok then
end end
comment.setup({ comment.setup({
pre_hook = function(ctx) pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
local U = require("Comment.utils") -- pre_hook = function(ctx)
-- local U = require("Comment.utils")
-- --
-- local status_utils_ok, utils = pcall(require, "ts_context_commentstring.utils") -- local status_utils_ok, utils = pcall(require, "ts_context_commentstring.utils")
-- if not status_utils_ok then -- if not status_utils_ok then
@ -28,5 +29,5 @@ comment.setup({
-- key = ctx.ctype == U.ctype.line and "__default" or "__multiline", -- key = ctx.ctype == U.ctype.line and "__default" or "__multiline",
-- location = location, -- location = location,
-- }) -- })
end, -- end,
}) })