Report position of type parameter rather than function type

Michael Thomas · facebook-github-bot · commit d575a6751250 · 2025-05-14T01:23:49.000-07:00
Summary:
The `reified_check` currently uses the function position as the `decl_pos` when reporting that an argument must be given because it is declared `reify`.

In the typing of function pointers to methods, the function position will actually be the expression location so this diff updates the reporting to give the position of the first type parameter that is declared `reify` instead.

Reviewed By: andrewjkennedy

Differential Revision: D74658684

fbshipit-source-id: 4d4c7420c2f8b5c168d39d1ff89c6a00128ea367
diff --git a/hphp/hack/src/typing/tast_check/reified_check.ml b/hphp/hack/src/typing/tast_check/reified_check.ml
@@ -152,6 +152,16 @@ let verify_call_targs ?special_code env expr_pos decl_pos tparams targs =
     let targs_length = List.length targs in
     if Int.( <> ) tparams_length targs_length then
       if Int.( = ) targs_length 0 then
+        let decl_pos =
+          Option.value
+            ~default:decl_pos
+            (List.find_map tparams ~f:(fun tparam ->
+                 if is_reified tparam then
+                   let Typing_defs_core.{ tp_name = (pos, _); _ } = tparam in
+                   Some pos
+                 else
+                   None))
+        in
         Typing_error_utils.add_typing_error
           ~env:(Tast_env.tast_env_as_typing_env env)
           Typing_error.(
@@ -164,6 +174,16 @@ let verify_call_targs ?special_code env expr_pos decl_pos tparams targs =
     List.for_all ~f:(fun (_, h) -> Aast_defs.is_wildcard_hint h) targs
   in
   if all_wildcards && tparams_has_reified tparams then
+    let decl_pos =
+      Option.value
+        ~default:decl_pos
+        (List.find_map tparams ~f:(fun tparam ->
+             if is_reified tparam then
+               let Typing_defs_core.{ tp_name = (pos, _); _ } = tparam in
+               Some pos
+             else
+               None))
+    in
     Typing_error_utils.add_typing_error
       ~env:(Tast_env.tast_env_as_typing_env env)
       Typing_error.(
diff --git a/hphp/hack/test/typecheck/function_pointer/class_meth_reified.php.exp b/hphp/hack/test/typecheck/function_pointer/class_meth_reified.php.exp
@@ -1,8 +1,8 @@
 ERROR: File "class_meth_reified.php", line 8, characters 3-12:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_meth_reified.php", line 4, characters 26-28:
+  File "class_meth_reified.php", line 4, characters 36-36:
   Definition is here
 ERROR: File "class_meth_reified.php", line 10, characters 3-12:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_meth_reified.php", line 4, characters 26-28:
+  File "class_meth_reified.php", line 4, characters 36-36:
   Definition is here
diff --git a/hphp/hack/test/typecheck/function_pointer/class_meth_reified_self.php.exp b/hphp/hack/test/typecheck/function_pointer/class_meth_reified_self.php.exp
@@ -1,4 +1,4 @@
 ERROR: File "class_meth_reified_self.php", line 7, characters 5-15:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_meth_reified_self.php", line 4, characters 26-28:
+  File "class_meth_reified_self.php", line 4, characters 36-36:
   Definition is here
diff --git a/hphp/hack/test/typecheck/function_pointer/class_meth_reified_static.php.exp b/hphp/hack/test/typecheck/function_pointer/class_meth_reified_static.php.exp
@@ -1,4 +1,4 @@
 ERROR: File "class_meth_reified_static.php", line 7, characters 5-17:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_meth_reified_static.php", line 4, characters 26-28:
+  File "class_meth_reified_static.php", line 4, characters 36-36:
   Definition is here
diff --git a/hphp/hack/test/typecheck/function_pointer/class_meth_reified_targs_missing.php.exp b/hphp/hack/test/typecheck/function_pointer/class_meth_reified_targs_missing.php.exp
@@ -1,4 +1,4 @@
 ERROR: File "class_meth_reified_targs_missing.php", line 8, characters 8-17:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_meth_reified_targs_missing.php", line 4, characters 26-28:
+  File "class_meth_reified_targs_missing.php", line 4, characters 36-36:
   Definition is here
diff --git a/hphp/hack/test/typecheck/function_pointer/class_meth_reified_trait.php.exp b/hphp/hack/test/typecheck/function_pointer/class_meth_reified_trait.php.exp
@@ -1,8 +1,8 @@
 ERROR: File "class_meth_reified_trait.php", line 8, characters 3-12:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_meth_reified_trait.php", line 4, characters 26-28:
+  File "class_meth_reified_trait.php", line 4, characters 36-36:
   Definition is here
 ERROR: File "class_meth_reified_trait.php", line 10, characters 3-12:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_meth_reified_trait.php", line 4, characters 26-28:
+  File "class_meth_reified_trait.php", line 4, characters 36-36:
   Definition is here
diff --git a/hphp/hack/test/typecheck/function_pointer/reified_fun.php.exp b/hphp/hack/test/typecheck/function_pointer/reified_fun.php.exp
@@ -1,4 +1,4 @@
 ERROR: File "reified_fun.php", line 6, characters 3-7:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "reified_fun.php", line 6, characters 3-7:
+  File "reified_fun.php", line 3, characters 20-20:
   Definition is here
diff --git a/hphp/hack/test/typecheck/function_pointer/reified_targs_missing.php.exp b/hphp/hack/test/typecheck/function_pointer/reified_targs_missing.php.exp
@@ -1,4 +1,4 @@
 ERROR: File "reified_targs_missing.php", line 7, characters 8-12:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "reified_targs_missing.php", line 7, characters 8-12:
+  File "reified_targs_missing.php", line 3, characters 20-20:
   Definition is here
diff --git a/hphp/hack/test/typecheck/generics_restrictions/explicit_reify_static_methods.php.exp b/hphp/hack/test/typecheck/generics_restrictions/explicit_reify_static_methods.php.exp
@@ -26,9 +26,9 @@ Illegal wildcard (`_`): generic type parameter `TF` must be specified explicitly
   Definition is here
 ERROR: File "explicit_reify_static_methods.php", line 32, characters 3-14:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "explicit_reify_static_methods.php", line 13, characters 26-32:
+  File "explicit_reify_static_methods.php", line 13, characters 40-41:
   Definition is here
 ERROR: File "explicit_reify_static_methods.php", line 34, characters 3-17:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "explicit_reify_static_methods.php", line 13, characters 26-32:
+  File "explicit_reify_static_methods.php", line 13, characters 40-41:
   Definition is here
diff --git a/hphp/hack/test/typecheck/reified_generics/class_soft_reification.php.exp b/hphp/hack/test/typecheck/reified_generics/class_soft_reification.php.exp
@@ -1,10 +1,10 @@
 ERROR: File "class_soft_reification.php", line 12, characters 3-19:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_soft_reification.php", line 5, characters 7-17:
+  File "class_soft_reification.php", line 5, characters 36-36:
   Definition is here
 ERROR: File "class_soft_reification.php", line 15, characters 3-15:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "class_soft_reification.php", line 6, characters 7-13:
+  File "class_soft_reification.php", line 6, characters 21-21:
   Definition is here
 ERROR: File "class_soft_reification.php", line 28, characters 19-24:
 Invalid reified hint (Typing[4305])
diff --git a/hphp/hack/test/typecheck/reified_generics/function_missing_args.php.exp b/hphp/hack/test/typecheck/reified_generics/function_missing_args.php.exp
@@ -1,6 +1,6 @@
 ERROR: File "function_missing_args.php", line 8, characters 3-6:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "function_missing_args.php", line 4, characters 10-10:
+  File "function_missing_args.php", line 4, characters 18-19:
   Definition is here
 ERROR: File "function_missing_args.php", line 9, characters 3-3:
 Expected no type parameters (Typing[4029])
diff --git a/hphp/hack/test/typecheck/reified_generics/function_soft_reification.php.exp b/hphp/hack/test/typecheck/reified_generics/function_soft_reification.php.exp
@@ -1,10 +1,10 @@
 ERROR: File "function_soft_reification.php", line 12, characters 3-15:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "function_soft_reification.php", line 5, characters 10-20:
+  File "function_soft_reification.php", line 5, characters 39-39:
   Definition is here
 ERROR: File "function_soft_reification.php", line 15, characters 3-11:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "function_soft_reification.php", line 6, characters 10-16:
+  File "function_soft_reification.php", line 6, characters 24-24:
   Definition is here
 ERROR: File "function_soft_reification.php", line 28, characters 15-20:
 Invalid reified hint (Typing[4305])
diff --git a/hphp/hack/test/typecheck/reified_generics/method_soft_reification.php.exp b/hphp/hack/test/typecheck/reified_generics/method_soft_reification.php.exp
@@ -1,10 +1,10 @@
 ERROR: File "method_soft_reification.php", line 16, characters 3-19:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "method_soft_reification.php", line 6, characters 19-29:
+  File "method_soft_reification.php", line 6, characters 48-48:
   Definition is here
 ERROR: File "method_soft_reification.php", line 19, characters 3-15:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "method_soft_reification.php", line 7, characters 19-25:
+  File "method_soft_reification.php", line 7, characters 33-33:
   Definition is here
 ERROR: File "method_soft_reification.php", line 34, characters 19-24:
 Invalid reified hint (Typing[4305])
diff --git a/hphp/hack/test/typecheck/reified_generics/new_classname.php.exp b/hphp/hack/test/typecheck/reified_generics/new_classname.php.exp
@@ -1,8 +1,8 @@
 ERROR: File "new_classname.php", line 8, characters 3-10:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "new_classname.php", line 3, characters 13-15:
+  File "new_classname.php", line 3, characters 23-23:
   Definition is here
 ERROR: File "new_classname.php", line 13, characters 3-10:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "new_classname.php", line 3, characters 13-15:
+  File "new_classname.php", line 3, characters 23-23:
   Definition is here
diff --git a/hphp/hack/test/typecheck/reified_generics/new_classname_nothing.php.exp b/hphp/hack/test/typecheck/reified_generics/new_classname_nothing.php.exp
@@ -1,4 +1,4 @@
 ERROR: File "new_classname_nothing.php", line 6, characters 3-10:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "new_classname_nothing.php", line 3, characters 13-15:
+  File "new_classname_nothing.php", line 3, characters 23-23:
   Definition is here
diff --git a/hphp/hack/test/typecheck/reified_generics/new_classname_soft.php.exp b/hphp/hack/test/typecheck/reified_generics/new_classname_soft.php.exp
@@ -1,4 +1,4 @@
 ERROR: File "new_classname_soft.php", line 12, characters 3-10:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "new_classname_soft.php", line 3, characters 13-15:
+  File "new_classname_soft.php", line 3, characters 34-34:
   Definition is here
diff --git a/hphp/hack/test/typecheck/reified_generics/new_expression.php.exp b/hphp/hack/test/typecheck/reified_generics/new_expression.php.exp
@@ -4,5 +4,5 @@ Wrong number of type arguments (expected 0, got 1) (Typing[4101])
   Definition is here
 ERROR: File "new_expression.php", line 12, characters 3-9:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "new_expression.php", line 6, characters 7-7:
+  File "new_expression.php", line 6, characters 15-15:
   Definition is here
diff --git a/hphp/hack/test/typecheck/reified_generics/valid_targ_wildcard_call.php.exp b/hphp/hack/test/typecheck/reified_generics/valid_targ_wildcard_call.php.exp
@@ -1,6 +1,6 @@
 ERROR: File "valid_targ_wildcard_call.php", line 8, characters 3-8:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "valid_targ_wildcard_call.php", line 5, characters 10-10:
+  File "valid_targ_wildcard_call.php", line 5, characters 18-19:
   Definition is here
 ERROR: File "valid_targ_wildcard_call.php", line 9, characters 5-8:
 Invalid reified hint (Typing[4305])
diff --git a/hphp/hack/test/typecheck/reified_generics/valid_targ_wildcard_new.php.exp b/hphp/hack/test/typecheck/reified_generics/valid_targ_wildcard_new.php.exp
@@ -1,6 +1,6 @@
 ERROR: File "valid_targ_wildcard_new.php", line 7, characters 3-12:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "valid_targ_wildcard_new.php", line 4, characters 7-7:
+  File "valid_targ_wildcard_new.php", line 4, characters 15-16:
   Definition is here
 ERROR: File "valid_targ_wildcard_new.php", line 8, characters 9-12:
 Invalid reified hint (Typing[4305])
diff --git a/hphp/hack/test/typecheck/reified_type_arg_check_on_like_type.php.exp b/hphp/hack/test/typecheck/reified_type_arg_check_on_like_type.php.exp
@@ -1,4 +1,4 @@
 ERROR: File "reified_type_arg_check_on_like_type.php", line 16, characters 3-11:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "reified_type_arg_check_on_like_type.php", line 7, characters 19-21:
+  File "reified_type_arg_check_on_like_type.php", line 7, characters 29-29:
   Definition is here
diff --git a/hphp/hack/test/typecheck/reified_type_arg_check_on_like_type.php.imp_pess_exp b/hphp/hack/test/typecheck/reified_type_arg_check_on_like_type.php.imp_pess_exp
@@ -1,4 +1,4 @@
 ERROR: File "reified_type_arg_check_on_like_type.php", line 16, characters 3-11:
 All type arguments must be specified because a type parameter is reified (Typing[4303])
-  File "reified_type_arg_check_on_like_type.php", line 11, characters 26-26:
+  File "reified_type_arg_check_on_like_type.php", line 7, characters 29-29:
   Definition is here
