diff options
| author | Amaan Qureshi <amaanq@macbook-air.myfiosgateway.com> | 2023-07-12 07:09:54 -0400 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2023-07-12 15:51:15 +0200 |
| commit | 823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e (patch) | |
| tree | e11375a68339d29faf8335a7e40488c0b4340b33 /queries/jsx | |
| parent | chore: update Regex from upstream (diff) | |
| download | nvim-treesitter-823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e.tar nvim-treesitter-823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e.tar.gz nvim-treesitter-823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e.tar.bz2 nvim-treesitter-823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e.tar.lz nvim-treesitter-823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e.tar.xz nvim-treesitter-823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e.tar.zst nvim-treesitter-823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e.zip | |
chore: update JSX from upstream
Diffstat (limited to 'queries/jsx')
| -rw-r--r-- | queries/jsx/highlights.scm | 11 | ||||
| -rw-r--r-- | queries/jsx/indents.scm | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm index 1f19c6b2a..718add87f 100644 --- a/queries/jsx/highlights.scm +++ b/queries/jsx/highlights.scm @@ -1,9 +1,8 @@ (jsx_element open_tag: (jsx_opening_element ["<" ">"] @tag.delimiter)) (jsx_element - close_tag: (jsx_closing_element ["<" "/" ">"] @tag.delimiter)) -(jsx_self_closing_element ["/" ">" "<"] @tag.delimiter) -(jsx_fragment [">" "<" "/"] @tag.delimiter) + close_tag: (jsx_closing_element ["</" ">"] @tag.delimiter)) +(jsx_self_closing_element ["<" "/>"] @tag.delimiter) (jsx_attribute (property_identifier) @tag.attribute) (jsx_opening_element @@ -19,18 +18,18 @@ (#lua-match? @constructor "^[A-Z]"))) ; Handle the dot operator effectively - <My.Component> -(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor))) +(jsx_opening_element ((member_expression (identifier) @tag (property_identifier) @constructor))) (jsx_closing_element ((identifier) @constructor (#lua-match? @constructor "^[A-Z]"))) ; Handle the dot operator effectively - </My.Component> -(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor))) +(jsx_closing_element ((member_expression (identifier) @tag (property_identifier) @constructor))) (jsx_self_closing_element ((identifier) @constructor (#lua-match? @constructor "^[A-Z]"))) ; Handle the dot operator effectively - <My.Component /> -(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor))) +(jsx_self_closing_element ((member_expression (identifier) @tag (property_identifier) @constructor))) (jsx_text) @none diff --git a/queries/jsx/indents.scm b/queries/jsx/indents.scm index 3355061e1..c0dd53281 100644 --- a/queries/jsx/indents.scm +++ b/queries/jsx/indents.scm @@ -1,16 +1,11 @@ [ - (jsx_fragment) (jsx_element) (jsx_self_closing_element) (jsx_expression) ] @indent.begin -(jsx_fragment - ("<" ">" (_) "<" @indent.branch "/" ">" @indent.end) -) - (jsx_closing_element (">" @indent.end)) -(jsx_self_closing_element ">" @indent.end) +(jsx_self_closing_element "/>" @indent.end) [ (jsx_closing_element) @@ -18,4 +13,4 @@ ] @indent.branch ; <button ; /> -(jsx_self_closing_element "/" @indent.branch) +(jsx_self_closing_element "/>" @indent.branch) |