Movatterモバイル変換

Skip to content

rescript-lang/rescriptPublic

NotificationsYou must be signed in to change notification settings
Fork471
Star7.2k

Commitd5cc8ea

Copilot

tsnobip

authored and

committed

Wrap non-component JSX children in curly braces

1 parent1cd4744 commitd5cc8eaCopy full SHA for d5cc8ea

File tree

11 files changed

+36

-60

lines changed

CHANGELOG.md
compiler/syntax/src
- res_parens.ml
tests
- build_tests/super_errors
  - expected
    - react_component_with_props.res.expected
  - fixtures
    - react_component_with_props.res
- gentype_tests/typescript-react-example/src
  - Hooks.res
- syntax_tests/data
  - conversion/reason/expected
    - jsxProps.res.txt
  - printer
    - comments/expected
      - jsx.res.txt
    - expr/expected
    - other/expected
      - fatSlider.res.txt

11 files changed

+36

-60

lines changed

`‎CHANGELOG.md‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`
`20`	`20`	`####:eyeglasses: Spec Compliance`
`21`	`21`
	`22`	`+- Wrap variables in curly braces inside JSX children.https://github.com/rescript-lang/rescript/pull/7863`
	`23`	`+`
`22`	`24`	`####:rocket: New Feature`
`23`	`25`
`24`	`26`	- Add`Array.filterMapWithIndex` to Stdlib.https://github.com/rescript-lang/rescript/pull/7876

`‎compiler/syntax/src/res_parens.ml‎`

Lines changed: 1 addition & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -354,39 +354,13 @@ let jsx_prop_expr expr =`
`354`	`354`
`355`	`355`	`letjsx_child_exprexpr=`
`356`	`356`	`match expr.Parsetree.pexp_descwith`
`357`		`-\|Parsetree.Pexp_let _\|Pexp_sequence _\|Pexp_letexception _`
`358`		`-\|Pexp_letmodule_\|Pexp_open_ ->`
`359`		`-Nothing`
	`357`	`+\|Parsetree.Pexp_let_\|Pexp_sequence_ ->Nothing`
`360`	`358`	`\|_ -> (`
`361`	`359`	`let opt_braces, _=ParsetreeViewer.process_braces_attr exprin`
`362`	`360`	`match opt_braceswith`
`363`	`361`	`\|Some ({Location.loc =braces_loc},_) ->Braced braces_loc`
`364`	`362`	`\|_ -> (`
`365`	`363`	`match exprwith`
`366`		`-\| {`
`367`		`-Parsetree.pexp_desc=`
`368`		`-Pexp_constant (Pconst_integer (x, _)\|Pconst_float (x, _));`
`369`		`- pexp_attributes=[];`
`370`		`- }`
`371`		`-when starts_with_minus x ->`
`372`		`-Parenthesized`
`373`		`-\|_whenParsetreeViewer.expr_is_await expr ->Parenthesized`
`374`		`-\| {`
`375`		`-Parsetree.pexp_desc=`
`376`		`- (Pexp_ident _\|Pexp_constant _\|Pexp_field _\|Pexp_construct _`
`377`		`-\|Pexp_variant _\|Pexp_array _\|Pexp_pack _\|Pexp_record _`
`378`		`-\|Pexp_extension _\|Pexp_letmodule _\|Pexp_letexception _`
`379`		`-\|Pexp_open _\|Pexp_sequence _\|Pexp_let _\|Pexp_jsx_element _ );`
`380`		`- pexp_attributes=[];`
`381`		`- } ->`
`382`		`-Nothing`
`383`		`-\| {`
`384`		`-Parsetree.pexp_desc=`
`385`		`-Pexp_constraint`
`386`		`- ({pexp_desc=Pexp_pack _}, {ptyp_desc=Ptyp_package _});`
`387`		`- pexp_attributes=[];`
`388`		`- } ->`
`389`		`-Nothing`
`390`	`364`	`\|{pexp_desc =Pexp_jsx_element_} ->Nothing`
`391`	`365`	`\|_ ->Parenthesized))`
`392`	`366`

`‎tests/build_tests/super_errors/expected/react_component_with_props.res.expected‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`[1;31m3[0m [2m│[0m let make = React.forwardRef([1;31m([0m`
`8`	`8`	`[1;31m4[0m [2m│[0m [1;31m ~className=?,[0m`
`9`	`9`	`[2m.[0m [2m│[0m [2m...[0m`
`10`		`- [1;31m12[0m [2m│[0m [1;31m children[0m`
	`10`	`+ [1;31m12[0m [2m│[0m [1;31m{children}[0m`
`11`	`11`	`[1;31m13[0m [2m│[0m [1;31m </div>[0m`
`12`	`12`	`14 [2m│[0m )`
`13`	`13`	`15 [2m│[0m }`

`‎tests/build_tests/super_errors/fixtures/react_component_with_props.res‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ module V4C7 = {`
`9`	`9`	`<input`
`10`	`10`	`type_="text" ?classNameref=?{Js.Nullable.toOption(ref)->Belt.Option.map(React.Ref.domRef)}`
`11`	`11`	`/>`
`12`		`-children`
	`12`	`+{children}`
`13`	`13`	`</div>`
`14`	`14`	`)`
`15`	`15`	`}`

`‎tests/gentype_tests/typescript-react-example/src/Hooks.res‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ module Inner = {`
`60`	`60`
`61`	`61`	`moduleNoProps= {`
`62`	`62`	`@genType @react.component`
`63`		`-letmake= ()=> <div>React.null </div>`
	`63`	`+letmake= ()=> <div>{React.null} </div>`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`typecb= (~_to:vehicle)=>unit`
`@@ -133,7 +133,7 @@ module WithChildren = {`
`133`	`133`	`letaComponentWithChildren= (~vehicle, ~children)=>`
`134`	`134`	`<div>`
`135`	`135`	`{React.string("Another Hook "++vehicle.name)}`
`136`		`- <div>children </div>`
	`136`	`+ <div>{children} </div>`
`137`	`137`	`</div>`
`138`	`138`	`}`
`139`	`139`

`‎tests/syntax_tests/data/conversion/reason/expected/jsxProps.res.txt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ let handleClick = (href, event) =>`
`6`	`6`
`7`	`7`	`@react.component`
`8`	`8`	`let make = (~href, ~className="", ~children) =>`
`9`		`- <a href className onClick={event => handleClick(href, event)}> children </a>`
	`9`	`+ <a href className onClick={event => handleClick(href, event)}>{children} </a>`

`‎tests/syntax_tests/data/printer/comments/expected/jsx.res.txt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module Cite = {`
`3`	`3`	`let make = (~author: option<string>, ~children) => {`
`4`	`4`	`// For semantics, check out`
`5`	`5`	`// https://css-tricks.com/quoting-in-html-quotations-citations-and-blockquotes/`
`6`		`- <div> foo </div>`
	`6`	`+ <div>{foo} </div>`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`

`‎tests/syntax_tests/data/printer/expr/expected/braced.res.txt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ apply({`
`282`	`282`	`a`
`283`	`283`	`})`
`284`	`284`
`285`		`-let x = {<div> child </div>}`
	`285`	`+let x = {<div>{child} </div>}`
`286`	`286`
`287`	`287`	`// not valid jsx`
`288`	`288`	`let x = {@JSX child}`

`‎tests/syntax_tests/data/printer/expr/expected/exoticIdent.res.txt‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ let x = 1`
`61`	`61`
`62`	`62`	`let x =`
`63`	`63`	`<div \"aria-foo"=\"type">`
`64`		`- \"module"`
`65`		`- \"let"`
	`64`	`+{\"module"}`
	`65`	`+{\"let"}`
`66`	`66`	`</div>`
`67`	`67`
`68`	`68`	`type dict = {`

`‎tests/syntax_tests/data/printer/expr/expected/jsx.res.txt‎`

Lines changed: 23 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,8 @@ let x =`
`209`	`209`
`210`	`210`	`let x =`
`211`	`211`	`<div>`
`212`		`- ident`
`213`		`- "constant"`
	`212`	`+{ident}`
	`213`	`+{"constant"}`
`214`	`214`	`{`
`215`	`215`	`let a = 1`
`216`	`216`	`let b = 2`
`@@ -240,13 +240,13 @@ let x =`
`240`	`240`	`\| Error => ()`
`241`	`241`	`}}`
`242`	`242`	`{(a, b, c)}`
`243`		`- Rgb(red, blue, green)`
`244`		`- list{}`
`245`		`- list{a, b}`
`246`		`- list{a, b, ...x}`
`247`		`- [a, b, c]`
`248`		`- {x: 1, y: 2}`
`249`		`- foo.bar`
	`243`	`+{Rgb(red, blue, green)}`
	`244`	`+{list{}}`
	`245`	`+{list{a, b}}`
	`246`	`+{list{a, b, ...x}}`
	`247`	`+{[a, b, c]}`
	`248`	`+ {{x: 1, y: 2}}`
	`249`	`+{foo.bar}`
`250`	`250`	`{user.name = "Steve"}`
`251`	`251`	`{if true {`
`252`	`252`	`()`
`@@ -264,29 +264,29 @@ let x =`
`264`	`264`	`do(i)`
`265`	`265`	`}}`
`266`	`266`	`{(20: int)}`
`267`		`- {`
	`267`	`+ {{`
`268`	`268`	`module L = Log`
`269`	`269`	`L.log()`
`270`		`- }`
`271`		`- {`
	`270`	`+ }}`
	`271`	`+ {{`
`272`	`272`	`exception Exit`
`273`	`273`	`throw(Exit)`
`274`		`- }`
	`274`	`+ }}`
`275`	`275`	`{assert(true)}`
`276`	`276`	`{module(Foo)}`
`277`		`- module(Foo)`
	`277`	`+{module(Foo)}`
`278`	`278`	`{module(Foo: Bar)}`
`279`		`- module(Foo: Bar)`
`280`		`- {`
	`279`	`+{module(Foo: Bar)}`
	`280`	`+ {{`
`281`	`281`	`open React`
`282`	`282`	`React.render()`
`283`		`- }`
`284`		`- %raw("eval()")`
`285`		`- {"x": 1, "y": 2}`
	`283`	`+ }}`
	`284`	`+{%raw("eval()")}`
	`285`	`+ {{"x": 1, "y": 2}}`
`286`	`286`	`{@attr ident}`
`287`	`287`	`</div>`
`288`	`288`
`289`		`-let x = <MyComponent sidebar={<div> test </div>} nav={<Navbar />} />`
	`289`	`+let x = <MyComponent sidebar={<div>{test} </div>} nav={<Navbar />} />`
`290`	`290`
`291`	`291`	`<div>`
`292`	`292`	`{possibleGradeValues`
`@@ -314,7 +314,7 @@ let x = <MyComponent sidebar={<div> test </div>} nav={<Navbar />} />`
`314`	`314`	`module App = {`
`315`	`315`	`@react.component`
`316`	`316`	`let make = () => {`
`317`		`- <>1 </>`
	`317`	`+ <>{1} </>`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`
`@@ -492,14 +492,14 @@ let fragmented_moo =`
`492`	`492`
`493`	`493`	`let arrow_with_fragment = el => <>`
`494`	`494`	`{t(nbsp ++ "(")}`
`495`		`-el`
	`495`	`+{el}`
`496`	`496`	`{t(")")}`
`497`	`497`	`</>`
`498`	`498`
`499`	`499`	`let arrow_with_container_tag = el =>`
`500`	`500`	`<div>`
`501`	`501`	`{t(nbsp ++ "(")}`
`502`		`-el`
	`502`	`+{el}`
`503`	`503`	`{t(")")}`
`504`	`504`	`</div>`
`505`	`505`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp