Price/nvim-ts-autotag
1
0
Fork 0
mirror of https://github.com/windwp/nvim-ts-autotag.git synced 2025-01-23 18:23:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'windwp:main' into fix-#199

Browse Source
This commit is contained in:
roycrippen4 2024-07-14 13:33:40 -04:00 committed by roy.crippen4
commit c1735fccae
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lua/nvim-ts-autotag.lua
View File

@ -9,6 +9,9 @@ function M.init()
if not nvim_ts then
return
end
if nvim_ts.define_modules == nil then
return
end
nvim_ts.define_modules({
autotag = {
attach = function(bufnr, _)

13
lua/nvim-ts-autotag/internal.lua
View File

@ -245,9 +245,9 @@ end
local function is_react_file()
local ft = vim.bo.ft
-- check filetypes first.
if ft == 'javascriptreact' or 'typescriptreact' then
if ft == "javascriptreact" or "typescriptreact" then
return true
elseif ft ~= 'javascript' then
elseif ft ~= "javascript" then
return false
end
@ -263,7 +263,7 @@ local function is_react_file()
local root = tree[1]:root()
-- parse the tree for jsx nodes
local query = vim.treesitter.query.parse('javascript', [[
local query = vim.treesitter.query.parse("javascript", [[
(jsx_element)
(jsx_self_closing_element)
]])
@ -494,7 +494,7 @@ M.attach = function(bufnr)
if TagConfigs:get(vim.bo.filetype) ~= nil then
setup_ts_tag()
local group = vim.api.nvim_create_augroup("nvim-ts-autotag", { clear = true })
local group = vim.api.nvim_create_augroup("nvim-ts-autotag-" .. bufnr, { clear = true })
if Setup.get_opts(vim.bo.filetype).enable_close then
vim.keymap.set("i", ">", function()
local row, col = unpack(vim.api.nvim_win_get_cursor(0))
@ -524,12 +524,9 @@ M.attach = function(bufnr)
})
end
if Setup.get_opts(vim.bo.filetype).enable_rename then
-- HACK: This does not bind to a specific buffer, unfortunately it seems doing so will
-- break rename when switching between different buffers. Making it *not* bind to a
-- specific buffer shouldn't cause any problems in theory. Ideally it would be bound per
-- buffer, but for now this works (and I'm lazy).
vim.api.nvim_create_autocmd("InsertLeave", {
group = group,
buffer = bufnr,
callback = M.rename_tag,
})
end