Skip to content

[Super errors] Tweak missing param msg #2548

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

Merged
merged 1 commit into from
Feb 28, 2018
Merged

[Super errors] Tweak missing param msg #2548

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
48 changes: 34 additions & 14 deletions jscomp/super_errors/super_typecore.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,15 @@ let show_extra_help ppf env trace = begin
| _ -> ();
end

let rec collect_missing_arguments rettype targettype = match rettype with
| {desc=Tarrow (label, argtype, rettype, _)} when rettype.desc = targettype.desc -> Some ((label, argtype) :: [])
| {desc=Tarrow (label, argtype, rettype, _)} -> begin
match collect_missing_arguments rettype targettype with
(* given type1 is foo => bar => baz and type 2 is bar => baz, return Some(foo) *)
let rec collect_missing_arguments type1 type2 = match type1 with
| {desc=Tarrow (label, argtype, typ, _)} when typ.desc = type2.desc ->
Some ((label, argtype) :: [])
| {desc=Tarrow (label, argtype, typ, _)} -> begin
match collect_missing_arguments typ type2 with
| Some res -> Some ((label, argtype) :: res)
| None -> None
end
end
| _ -> None

let check_bs_arity_mismatch ppf trace =
Expand Down Expand Up @@ -135,6 +137,8 @@ let report_error env ppf = function
(Ident.name id)
| Expr_type_clash trace ->
(* modified *)
(* this is the most frequent error. Do whatever we can to provide specific
guidance to this generic error before giving up *)
if Super_reason_react.state_escape_scope trace then
fprintf ppf "@[<v>\
@[@{<info>Is this a ReasonReact reducerComponent or component with retained props?@}@ \
Expand All @@ -149,7 +153,8 @@ let report_error env ppf = function
@[@{<info>Here's the original error message@}@]@,\
@]";
begin
let missing_arguments = match bottom_aliases trace with
let bottom_aliases_result = bottom_aliases trace in
let missing_arguments = match bottom_aliases_result with
| Some (actual, expected) -> collect_missing_arguments actual expected
| None -> assert false
in
Expand All @@ -161,21 +166,36 @@ let report_error env ppf = function
else fprintf ppf "@[(~%s: %a)@]" label type_expr argtype
)
in
match missing_arguments with
begin match missing_arguments with
| Some [singleArgument] ->
fprintf ppf "@[@{<info>This call is missing a final argument@} of type@ %a@]"
print_arguments [singleArgument]
| Some arguments ->
fprintf ppf "@[<hv>@{<info>This call is missing final arguments@} of type:@ %a@]"
print_arguments arguments
| None ->
check_bs_arity_mismatch ppf trace;
super_report_unification_error ppf env trace
(function ppf ->
fprintf ppf "This has type:")
(function ppf ->
fprintf ppf "But somewhere wanted:");
show_extra_help ppf env trace
let missing_parameters = match bottom_aliases_result with
| Some (actual, expected) -> collect_missing_arguments expected actual
| None -> assert false
in
begin match missing_parameters with
| Some [singleParameter] ->
fprintf ppf "@[This value seems to @{<info>need to be wrapped in a function@ that@ takes@ an@ extra@ argument@}@ of@ type@ %a@]"
print_arguments [singleParameter]
| Some arguments ->
fprintf ppf "@[<hv>@[This value seems to @{<info>need to be wrapped in a function@ that@ takes@ extra@ arguments@}@ of@ type:@]@ %a@]"
print_arguments arguments
| None ->
(* final fallback: show the generic type mismatch error *)
check_bs_arity_mismatch ppf trace;
super_report_unification_error ppf env trace
(function ppf ->
fprintf ppf "This has type:")
(function ppf ->
fprintf ppf "But somewhere wanted:");
show_extra_help ppf env trace;
end;
end;
end
| Apply_non_function typ ->
(* modified *)
Expand Down