git.iko.soy/helix
on master help sign in
build(tree-sitter): update javascript, typescript and tsx (#7852)

* build(tree-sitter): update javascript, typescript and tsx * update revision of tree-sitter parsers for these languages. * rename `?.` to `optional_chain`, introduced in tree-sitter/tree-sitter-javascript@186f2adbf790552b354a9ba712341c7d48bdbccd. * fix(highlight): change jsx queries to match latest tree-sitter Latest tree-sitter/tree-sitter-javascript@bb1f97b643b77fc1f082d621bf533b4b14cf0c3 added some breaking changes that broke highlighting. * Remove some queries with `nested_identifier`. * Remove deprecated `jsx_fragment` from indent query. * Count `</` and `/>` as a single token.

commit7cda5b85920f875052438791f01246a408ee490e authorwoojiq <122799969+woojiq@users.noreply.github.com> dateMon 7 Aug 2023, 22:07 (3 years ago) parent7af37bb
4 files changed+7−20
compare with master
unifiedsplit
languages.toml+3−3 runtime/queries/_jsx/highlights.scm+3−15 runtime/queries/_jsx/indents.scm−1 runtime/queries/ecma/highlights.scm+1−1
languages.toml+3−3
@@ -563,7 +563,7 @@ args = { program = "{0}" }
563563
564564[[grammar]]
565565name = "javascript"
566−source = { git = "https://github.com/tree-sitter/tree-sitter-javascript", rev = "4a95461c4761c624f2263725aca79eeaefd36cad" }
566+source = { git = "https://github.com/tree-sitter/tree-sitter-javascript", rev = "f772967f7b7bc7c28f845be2420a38472b16a8ee" }
567567
568568[[language]]
569569name = "jsx"
@@ -590,7 +590,7 @@ indent = { tab-width = 2, unit = " " }
590590
591591[[grammar]]
592592name = "typescript"
593−source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259", subpath = "typescript" }
593+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf", subpath = "typescript" }
594594
595595[[language]]
596596name = "tsx"
@@ -604,7 +604,7 @@ indent = { tab-width = 2, unit = " " }
604604
605605[[grammar]]
606606name = "tsx"
607−source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259", subpath = "tsx" }
607+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf", subpath = "tsx" }
608608
609609[[language]]
610610name = "css"
runtime/queries/_jsx/highlights.scm+3−15
@@ -4,9 +4,6 @@
44(jsx_opening_element ((identifier) @constructor
55 (#match? @constructor "^[A-Z]")))
66
7−; Handle the dot operator effectively - <My.Component>
8−(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
9−
107(jsx_opening_element (identifier) @tag)
118
129; Closing elements
@@ -15,9 +12,6 @@
1512(jsx_closing_element ((identifier) @constructor
1613 (#match? @constructor "^[A-Z]")))
1714
18−; Handle the dot operator effectively - </My.Component>
19−(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
20−
2115(jsx_closing_element (identifier) @tag)
2216
2317; Self-closing elements
@@ -26,9 +20,6 @@
2620(jsx_self_closing_element ((identifier) @constructor
2721 (#match? @constructor "^[A-Z]")))
2822
29−; Handle the dot operator effectively - <My.Component />
30−(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
31−
3223(jsx_self_closing_element (identifier) @tag)
3324
3425; Attributes
@@ -39,17 +30,14 @@
3930; Punctuation
4031; -----------
4132
42−; Handle attribute delimiter
33+; Handle attribute delimiter (<Component color="red"/>)
4334(jsx_attribute "=" @punctuation.delimiter)
4435
4536; <Component>
4637(jsx_opening_element ["<" ">"] @punctuation.bracket)
4738
4839; </Component>
49−(jsx_closing_element ["<" "/" ">"] @punctuation.bracket)
40+(jsx_closing_element ["</" ">"] @punctuation.bracket)
5041
5142; <Component />
52−(jsx_self_closing_element ["<" "/" ">"] @punctuation.bracket)
53−
54−; <> ... </>
55−(jsx_fragment ["<" "/" ">"] @punctuation.bracket)
43+(jsx_self_closing_element ["<" "/>"] @punctuation.braket)
runtime/queries/_jsx/indents.scm−1
@@ -1,5 +1,4 @@
11[
2− (jsx_fragment)
32 (jsx_element)
43 (jsx_self_closing_element)
54] @indent
runtime/queries/ecma/highlights.scm+1−1
@@ -109,7 +109,7 @@
109109
110110[
111111 ";"
112− "?."
112+ (optional_chain) ; ?.
113113 "."
114114 ","
115115] @punctuation.delimiter