Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix location issue for the treatment of async functions #6014

Merged
merged 1 commit into from
Feb 19, 2023
Merged

Fix location issue for the treatment of async functions #6014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
- Fix issue with using alias and default value together https://github.com/rescript-lang/syntax/pull/734
- Fix issue in `Js.Promise2` where `then` and `catch` were returning `undefined` https://github.com/rescript-lang/rescript-compiler/pull/5996
- Fix issue in the compiler back-end where async functions passed to an `@uncurry` external would be inlined and transformed in a way that loses async https://github.com/rescript-lang/rescript-compiler/pull/6011
- Fix location issue for the treatment of `async` functions where hovering on the body with a type error would show `'a => promise<'a>` everywhere https://github.com/rescript-lang/rescript-compiler/pull/6014

#### :rocket: New Feature

Expand Down
21 changes: 9 additions & 12 deletions jscomp/frontend/ast_async.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
let add_promise_type ~async (result : Parsetree.expression) =
let add_promise_type ?(loc=Location.none) ~async (result : Parsetree.expression) =
if async then
let txt =
Longident.Ldot (Longident.Ldot (Lident "Js", "Promise"), "unsafe_async")
let unsafe_async =
Ast_helper.Exp.ident ~loc
{ txt = Ldot (Ldot (Lident "Js", "Promise"), "unsafe_async"); loc }
in
let pexp_desc = Parsetree.Pexp_ident { txt; loc = result.pexp_loc } in
{
result with
pexp_desc = Pexp_apply ({ result with pexp_desc }, [ (Nolabel, result) ]);
}
Ast_helper.Exp.apply ~loc unsafe_async [ (Nolabel, result) ]
else result

let add_async_attribute ~async (body : Parsetree.expression) =
Expand All @@ -20,16 +17,16 @@ let add_async_attribute ~async (body : Parsetree.expression) =
}
else body

let rec add_promise_to_result (e : Parsetree.expression) =
let rec add_promise_to_result ~loc (e : Parsetree.expression) =
match e.pexp_desc with
| Pexp_fun (label, eo, pat, body) ->
let body = add_promise_to_result body in
let body = add_promise_to_result ~loc body in
{ e with pexp_desc = Pexp_fun (label, eo, pat, body) }
| _ -> add_promise_type ~async:true e
| _ -> add_promise_type ~loc ~async:true e

let make_function_async ~async (e : Parsetree.expression) =
if async then
match e.pexp_desc with
| Pexp_fun _ -> add_async_attribute ~async (add_promise_to_result e)
| Pexp_fun (_, _, {ppat_loc}, _) -> add_promise_to_result ~loc:ppat_loc e
| _ -> assert false
else e
21 changes: 9 additions & 12 deletions lib/4.06.1/unstable/js_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265941,16 +265941,13 @@ end
module Ast_async
= struct
#1 "ast_async.ml"
let add_promise_type ~async (result : Parsetree.expression) =
let add_promise_type ?(loc=Location.none) ~async (result : Parsetree.expression) =
if async then
let txt =
Longident.Ldot (Longident.Ldot (Lident "Js", "Promise"), "unsafe_async")
let unsafe_async =
Ast_helper.Exp.ident ~loc
{ txt = Ldot (Ldot (Lident "Js", "Promise"), "unsafe_async"); loc }
in
let pexp_desc = Parsetree.Pexp_ident { txt; loc = result.pexp_loc } in
{
result with
pexp_desc = Pexp_apply ({ result with pexp_desc }, [ (Nolabel, result) ]);
}
Ast_helper.Exp.apply ~loc unsafe_async [ (Nolabel, result) ]
else result

let add_async_attribute ~async (body : Parsetree.expression) =
Expand All @@ -265963,17 +265960,17 @@ let add_async_attribute ~async (body : Parsetree.expression) =
}
else body

let rec add_promise_to_result (e : Parsetree.expression) =
let rec add_promise_to_result ~loc (e : Parsetree.expression) =
match e.pexp_desc with
| Pexp_fun (label, eo, pat, body) ->
let body = add_promise_to_result body in
let body = add_promise_to_result ~loc body in
{ e with pexp_desc = Pexp_fun (label, eo, pat, body) }
| _ -> add_promise_type ~async:true e
| _ -> add_promise_type ~loc ~async:true e

let make_function_async ~async (e : Parsetree.expression) =
if async then
match e.pexp_desc with
| Pexp_fun _ -> add_async_attribute ~async (add_promise_to_result e)
| Pexp_fun (_, _, {ppat_loc}, _) -> add_promise_to_result ~loc:ppat_loc e
| _ -> assert false
else e

Expand Down
21 changes: 9 additions & 12 deletions lib/4.06.1/unstable/js_playground_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265941,16 +265941,13 @@ end
module Ast_async
= struct
#1 "ast_async.ml"
let add_promise_type ~async (result : Parsetree.expression) =
let add_promise_type ?(loc=Location.none) ~async (result : Parsetree.expression) =
if async then
let txt =
Longident.Ldot (Longident.Ldot (Lident "Js", "Promise"), "unsafe_async")
let unsafe_async =
Ast_helper.Exp.ident ~loc
{ txt = Ldot (Ldot (Lident "Js", "Promise"), "unsafe_async"); loc }
in
let pexp_desc = Parsetree.Pexp_ident { txt; loc = result.pexp_loc } in
{
result with
pexp_desc = Pexp_apply ({ result with pexp_desc }, [ (Nolabel, result) ]);
}
Ast_helper.Exp.apply ~loc unsafe_async [ (Nolabel, result) ]
else result

let add_async_attribute ~async (body : Parsetree.expression) =
Expand All @@ -265963,17 +265960,17 @@ let add_async_attribute ~async (body : Parsetree.expression) =
}
else body

let rec add_promise_to_result (e : Parsetree.expression) =
let rec add_promise_to_result ~loc (e : Parsetree.expression) =
match e.pexp_desc with
| Pexp_fun (label, eo, pat, body) ->
let body = add_promise_to_result body in
let body = add_promise_to_result ~loc body in
{ e with pexp_desc = Pexp_fun (label, eo, pat, body) }
| _ -> add_promise_type ~async:true e
| _ -> add_promise_type ~loc ~async:true e

let make_function_async ~async (e : Parsetree.expression) =
if async then
match e.pexp_desc with
| Pexp_fun _ -> add_async_attribute ~async (add_promise_to_result e)
| Pexp_fun (_, _, {ppat_loc}, _) -> add_promise_to_result ~loc:ppat_loc e
| _ -> assert false
else e

Expand Down
21 changes: 9 additions & 12 deletions lib/4.06.1/whole_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276328,16 +276328,13 @@ end
module Ast_async
= struct
#1 "ast_async.ml"
let add_promise_type ~async (result : Parsetree.expression) =
let add_promise_type ?(loc=Location.none) ~async (result : Parsetree.expression) =
if async then
let txt =
Longident.Ldot (Longident.Ldot (Lident "Js", "Promise"), "unsafe_async")
let unsafe_async =
Ast_helper.Exp.ident ~loc
{ txt = Ldot (Ldot (Lident "Js", "Promise"), "unsafe_async"); loc }
in
let pexp_desc = Parsetree.Pexp_ident { txt; loc = result.pexp_loc } in
{
result with
pexp_desc = Pexp_apply ({ result with pexp_desc }, [ (Nolabel, result) ]);
}
Ast_helper.Exp.apply ~loc unsafe_async [ (Nolabel, result) ]
else result

let add_async_attribute ~async (body : Parsetree.expression) =
Expand All @@ -276350,17 +276347,17 @@ let add_async_attribute ~async (body : Parsetree.expression) =
}
else body

let rec add_promise_to_result (e : Parsetree.expression) =
let rec add_promise_to_result ~loc (e : Parsetree.expression) =
match e.pexp_desc with
| Pexp_fun (label, eo, pat, body) ->
let body = add_promise_to_result body in
let body = add_promise_to_result ~loc body in
{ e with pexp_desc = Pexp_fun (label, eo, pat, body) }
| _ -> add_promise_type ~async:true e
| _ -> add_promise_type ~loc ~async:true e

let make_function_async ~async (e : Parsetree.expression) =
if async then
match e.pexp_desc with
| Pexp_fun _ -> add_async_attribute ~async (add_promise_to_result e)
| Pexp_fun (_, _, {ppat_loc}, _) -> add_promise_to_result ~loc:ppat_loc e
| _ -> assert false
else e

Expand Down