Skip to content
This repository was archived by the owner on Jun 15, 2023. It is now read-only.

Fix missing js attribute for string in braces #494

Merged
merged 1 commit into from
May 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/res_core.ml
Original file line number Diff line number Diff line change
Expand Up @@ -2772,7 +2772,7 @@ and parseBracedOrRecordExpr p =
Parser.expect Rbrace p;
expr
| _ ->
let constant = Ast_helper.Exp.constant ~loc:field.loc (Parsetree.Pconst_string(s, None)) in
let constant = Ast_helper.Exp.constant ~loc:field.loc (Parsetree.Pconst_string(s, Some("js"))) in
let a = parsePrimaryExpr ~operand:constant p in
let e = parseBinaryExpr ~a p 1 in
let e = parseTernaryExpr e p in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,5 @@ let foo = true
let foo = 2
let foo = f ()
let foo = ((2)[@ns.braces ])
let foo = (("foo")[@ns.braces ])
let foo = (({js|foo|js})[@ns.braces ])
let foo as x = ()
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ let e = (((fun x -> x + 1) |> sideEffect; logToAnalytics Shady.ml)
let f = ((fun event -> (event.target).value)[@ns.braces ])
let f = ((fun event -> ((event.target).value : string))[@ns.braces ])
let x = ((let a = 1 in let b = 2 in a + b)[@ns.braces ])
;;(([(("\n" |. React.string)[@ns.braces ])])[@JSX ])
;;(([(({js|
|js} |. React.string)[@ns.braces ])])[@JSX ])
15 changes: 8 additions & 7 deletions tests/parsing/grammar/expressions/expected/bsObject.res.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ let x = [%obj { age = 30 }]
let y = [%obj { age = 30 }]
let y = [%obj { age = 30; name = {js|steve|js} }]
let y = [%obj { age = 30; name = {js|steve|js} }]
let x = (("age")[@ns.braces ])
let x = (("age".(0))[@ns.braces ])
let x = (("age" |. Js.log)[@ns.braces ])
let x = ((if "age" then true else false)[@ns.braces ][@ns.ternary ])
let x = (("age" |. Js.log; (let foo = 1 in let bar = 2 in foo + bar))
let x = (({js|age|js})[@ns.braces ])
let x = (({js|age|js}.(0))[@ns.braces ])
let x = (({js|age|js} |. Js.log)[@ns.braces ])
let x = ((if {js|age|js} then true else false)[@ns.braces ][@ns.ternary ])
let x = (({js|age|js} |. Js.log; (let foo = 1 in let bar = 2 in foo + bar))
[@ns.braces ])
let x =
((((if "age" then true else false)
((((if {js|age|js} then true else false)
[@ns.ternary ]);
(let foo = 1 in let bar = 2 in foo + bar))
[@ns.braces ])
let x = (("age".(0); (let foo = 1 in let bar = 2 in foo + bar))[@ns.braces ])
let x = (({js|age|js}.(0); (let foo = 1 in let bar = 2 in foo + bar))
[@ns.braces ])
8 changes: 4 additions & 4 deletions tests/parsing/grammar/expressions/expected/jsx.res.txt
Original file line number Diff line number Diff line change
Expand Up @@ -491,24 +491,24 @@ let _ =
((button ?id:((id)[@ns.namedArgLoc ])
~className:((Cn.make [|{js|button|js};{js|is-fullwidth|js}|])
[@ns.namedArgLoc ][@ns.braces ]) ~onClick:((onClick)[@ns.namedArgLoc ])
~children:[(("Submit" |> ste)[@ns.braces ])] ())
~children:[(({js|Submit|js} |> ste)[@ns.braces ])] ())
[@JSX ])
let _ =
((button ?id:((id)[@ns.namedArgLoc ])
~className:((Cn.make [{js|button|js}; {js|is-fullwidth|js}])
[@ns.namedArgLoc ][@ns.braces ]) ~onClick:((onClick)[@ns.namedArgLoc ])
~children:[(("Submit" |> ste)[@ns.braces ])] ())
~children:[(({js|Submit|js} |> ste)[@ns.braces ])] ())
[@JSX ])
let _ =
((button ?id:((id)[@ns.namedArgLoc ])
~className:((Cn.make ({js|button|js}, {js|is-fullwidth|js}))
[@ns.namedArgLoc ][@ns.braces ]) ~onClick:((onClick)[@ns.namedArgLoc ])
~children:[(("Submit" |> ste)[@ns.braces ])] ())
~children:[(({js|Submit|js} |> ste)[@ns.braces ])] ())
[@JSX ])
let _ =
((button ?id:((id)[@ns.namedArgLoc ]) ~className:((Cn.make { a = b })
[@ns.namedArgLoc ][@ns.braces ]) ~onClick:((onClick)[@ns.namedArgLoc ])
~children:[(("Submit" |> ste)[@ns.braces ])] ())
~children:[(({js|Submit|js} |> ste)[@ns.braces ])] ())
[@JSX ])
let _ =
((X.createElement ~y:((z |. (Belt.Option.getWithDefault {js||js}))
Expand Down