diff --git a/lua/nvim-ts-autotag/internal.lua b/lua/nvim-ts-autotag/internal.lua index 2459624..0eced70 100644 --- a/lua/nvim-ts-autotag/internal.lua +++ b/lua/nvim-ts-autotag/internal.lua @@ -242,6 +242,42 @@ local function check_close_tag(close_slash_tag) return false end +local function is_react_file() + local ft = vim.bo.ft + -- check filetypes first. + if ft == "javascriptreact" or "typescriptreact" then + return true + elseif ft ~= "javascript" then + return false + end + + local ok, buf_parser = pcall(vim.treesitter.get_parser) + if not ok then + return false + end + + local tree = buf_parser:parse(true) + if not tree then + return false + end + + local root = tree[1]:root() + -- parse the tree for jsx nodes + local query = vim.treesitter.query.parse("javascript", [[ + (jsx_element) + (jsx_self_closing_element) + ]]) + + -- iterate over nodes to find jsx nodes + for _, node in query:iter_captures(root, 0, 0, -1) do + if node then + return true + end + end + return false +end + + M.close_tag = function() local ok, buf_parser = pcall(vim.treesitter.get_parser) if not ok then @@ -252,6 +288,9 @@ M.close_tag = function() if result == true and tag_name ~= nil then vim.api.nvim_put({ string.format("", tag_name) }, "", true, false) vim.cmd([[normal! F>]]) + elseif is_react_file() then + vim.api.nvim_put({ "" }, "", true, false) + vim.cmd([[normal! F>]]) end end diff --git a/tests/specs/closetag_spec.lua b/tests/specs/closetag_spec.lua index a48ee15..fc9f127 100644 --- a/tests/specs/closetag_spec.lua +++ b/tests/specs/closetag_spec.lua @@ -130,25 +130,7 @@ local data = { after = [[{(card.data >| 0) &&
}]], }, { - name = "15 vue auto close tag", - filepath = "./sample/index.vue", - filetype = "vue", - linenr = 4, - key = [[>]], - before = [[|]], - }, - { - name = "16 vue not close on script", - filepath = "./sample/index.vue", - filetype = "vue", - linenr = 12, - key = [[>]], - before = [[const data:Array| ]], - }, - { - name = "17 typescriptreact nested indentifer ", + name = "15 typescriptreact nested indentifer ", filepath = "./sample/index.tsx", filetype = "typescriptreact", linenr = 12, @@ -157,7 +139,34 @@ local data = { after = [[| ]], }, { - name = "18 php div ", + name = "16 typescriptreact autoclose fragment", + filepath = "./sample/index.tsx", + filetype = "typescriptreact", + linenr = 12, + key = [[>]], + before = [[<]], + after = [[<>|]] + }, + { + name = "17 vue auto close tag", + filepath = "./sample/index.vue", + filetype = "vue", + linenr = 4, + key = [[>]], + before = [[|]], + }, + { + name = "18 vue not close on script", + filepath = "./sample/index.vue", + filetype = "vue", + linenr = 12, + key = [[>]], + before = [[const data:Array| ]], + }, + { + name = "19 php div ", filepath = "./sample/index.php", filetype = "php", linenr = 25, @@ -175,7 +184,7 @@ local data = { -- after = [[
|
]], -- }, { - name = "19 lit template div", + name = "20 lit template div", filepath = "./sample/index.ts", filetype = "typescript", linenr = 3, @@ -184,7 +193,7 @@ local data = { after = [[
|
]], }, { - name = "20 eruby template div", + name = "21 eruby template div", filepath = "./sample/index.html.erb", filetype = "eruby", linenr = 10, @@ -193,7 +202,7 @@ local data = { after = [[
|
]], }, { - name = "20 eruby template ruby string", + name = "22 eruby template ruby string", filepath = "./sample/index.html.erb", filetype = "eruby", linenr = 10, @@ -202,7 +211,7 @@ local data = { after = [[<%=
| %> ]], }, { - name = "21 templ close tag", + name = "23 templ close tag", filepath = "./sample/index.templ", filetype = "templ", linenr = 10, @@ -211,7 +220,7 @@ local data = { after = [[
|
]], }, { - name = "22 templ close tag", + name = "24 templ close tag", filepath = "./sample/index.templ", filetype = "templ", linenr = 10, @@ -220,7 +229,7 @@ local data = { after = [[
|
]], }, { - name = "23 templ not close tag on close tag", + name = "25 templ not close tag on close tag", filepath = "./sample/index.templ", filetype = "templ", linenr = 10, @@ -229,7 +238,7 @@ local data = { after = [[
aa
|]], }, { - name = "24 templ not close on input tag", + name = "26 templ not close on input tag", filepath = "./sample/index.templ", filetype = "templ", linenr = 10,