fixup

Author: tjdevries

README.md

@@ -362,6 +362,7 @@ local ft = require('Comment.ft')
 ft.set('javascript', {'//%s', '/*%s*/'})
 
 -- set line, block and override commentstring
+-- for particular treesitter nodes
 ft.set("javascript", {
   "// %s",
   "/*%s*/",
@@ -447,17 +448,6 @@ There are multiple ways to contribute reporting/fixing bugs, feature requests. Y
 -   Live upto the expectation of `tcomment`
 -   Basic INSERT mode mappings
 -   Doc comment i.e `/**%s*/` (js), `///%s` (rust)
-
--   Inbuilt context commentstring using treesitter
-
-```lua
-{
-    pre_hook = function()
-        return require('Comment.ts').commentstring()
-    end
-}
-```
-
 -   Header comment
 
 ```lua

lua/Comment/comment.lua

@@ -15,7 +15,6 @@ function C.comment()
     local pattern = U.get_pattern(C.config.ignore)
     if not U.ignore(line, pattern) then
         local ctx = Ctx:new({
-            lang = U.get_lang(),
             cmode = U.cmode.comment,
             cmotion = U.cmotion.line,
             ctype = U.ctype.line,

lua/Comment/ctx.lua

@@ -18,7 +18,6 @@ function Ctx:new(opts)
 
     opts.lang = ts.get_lang()
     opts.contained = ts.get_containing_node()
-    opts.other = true
 
     return setmetatable(opts, self)
 end

lua/Comment/ft.lua

@@ -26,8 +26,28 @@ local L = {
     html = { M.html_b, M.html_b },
     idris = { M.dash, M.haskell_b },
     java = { M.cxx_l, M.cxx_b },
-    javascript = { M.cxx_l, M.cxx_b },
-    javascriptreact = { M.cxx_l, M.cxx_b },
+    javascript = {
+        M.cxx_l,
+        M.cxx_b,
+
+        jsx_fragment = { '{/* %s */}' },
+        jsx_element = { '{/* %s */}' },
+        jsx_attribute = { '// %s' },
+        jsx_expression = { '// %s', '/*%s*/' },
+        call_expression = { '// %s', '/*%s*/' },
+        statement_block = { '// %s' },
+    },
+    javascriptreact = {
+        M.cxx_l,
+        M.cxx_b,
+
+        jsx_fragment = { '{/* %s */}' },
+        jsx_element = { '{/* %s */}' },
+        jsx_attribute = { '// %s' },
+        jsx_expression = { '// %s', '/*%s*/' },
+        call_expression = { '// %s', '/*%s*/' },
+        statement_block = { '// %s' },
+    },
     julia = { M.hash, '#=%s=#' },
     lidris = { M.dash, M.haskell_b },
     lua = { M.dash, '--[[%s--]]' },