@@ -620,7 +620,7 @@ end = struct
 run this#function_return_annotation return;
 run this#function_body_any body;
 run_opt this#predicate predicate;
-run_opt this#type_params tparams;
+run_opt (this#type_params ~kind:Flow_ast_mapper.FunctionTP) tparams;
 expr)
 loc
 expr
@@ -634,7 +634,7 @@ end = struct
 ~is_polymorphic:(Option.is_some tparams)
 ~kind:Var
 (fun _ _ ->
-run_opt this#type_params tparams;
+run_opt (this#type_params ~kind:Flow_ast_mapper.ComponentDeclarationTP) tparams;
 run this#component_params params;
 run this#component_body body;
 run this#component_renders_annotation renders;
@@ -905,7 +905,7 @@ end = struct
 run this#function_return_annotation return;
 run this#function_body_any body;
 run_opt this#predicate predicate;
-run_opt this#type_params tparams;
+run_opt (this#type_params ~kind:Flow_ast_mapper.FunctionTP) tparams;
 expr)
 loc
 expr
@@ -941,7 +941,7 @@ end = struct
 run this#function_return_annotation return;
 run this#function_body_any body;
 run_opt this#predicate predicate;
-run_opt this#type_params tparams;
+run_opt (this#type_params ~kind:Flow_ast_mapper.FunctionTP) tparams;
 expr
 
 method! component_declaration loc (expr : ('loc, 'loc) Ast.Statement.ComponentDeclaration.t) =
@@ -955,7 +955,7 @@ end = struct
 ~is_polymorphic:(Option.is_some tparams)
 ~kind:Var
 (fun _ _ ->
-run_opt this#type_params tparams;
+run_opt (this#type_params ~kind:Flow_ast_mapper.ComponentDeclarationTP) tparams;
 run this#component_params params;
 run this#component_body body;
 run this#component_renders_annotation renders;

@@ -1348,7 +1348,9 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
 } =
 stmt
 in
-Base.Option.iter component_tparams ~f:(fun tparams -> ignore @@ this#type_params tparams);
+Base.Option.iter component_tparams ~f:(fun tparams ->
+ignore @@ this#type_params ~kind:Flow_ast_mapper.ComponentDeclarationTP tparams
+);
 Base.List.iter ~f:this#visit_component_param params_list;
 Base.Option.iter ~f:this#visit_component_rest_param rest;
 ignore @@ this#component_renders_annotation renders;
@@ -1706,7 +1708,9 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
 } =
 expr
 in
-Base.Option.iter fun_tparams ~f:(fun tparams -> ignore @@ this#type_params tparams);
+Base.Option.iter fun_tparams ~f:(fun tparams ->
+ignore @@ (this#type_params ~kind:Flow_ast_mapper.FunctionTP) tparams
+);
 run_opt this#function_this_param this_;
 let param_str_list = this#params_list_to_str_opt params_list in
 let pred = this#hint_pred_kind params body return in
@@ -1799,7 +1803,7 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
 this#in_scope
 (fun () ->
 run_opt this#class_identifier id;
-run_opt this#type_params class_tparams;
+run_opt (this#type_params ~kind:Flow_ast_mapper.ClassTP) class_tparams;
 let this_tparam_loc = Base.Option.value_map ~default:loc ~f:fst id in
 this#add_tparam this_tparam_loc "this";
 ignore @@ this#class_body body;
@@ -2243,22 +2247,26 @@ class def_finder ~autocomplete_hooks ~react_jsx env_info toplevel_scope =
 (OpaqueType (loc, otype));
 this#in_new_tparams_env (fun () -> super#opaque_type loc otype)
 
-method private visit_type_param ~from_infer_type (tparam : ('loc, 'loc) Ast.Type.TypeParam.t) =
+method private visit_type_param
+~from_infer_type ~kind (tparam : ('loc, 'loc) Ast.Type.TypeParam.t) =
 let open Ast.Type.TypeParam in
 let (_, { name = (name_loc, { Ast.Identifier.name; _ }); _ }) = tparam in
 this#force_add_binding
 (Env_api.OrdinaryNameLoc, name_loc)
 (mk_reason (RType (OrdinaryName name)) name_loc)
 (TypeParam { tparams_map = tparams; from_infer_type; tparam });
 this#add_tparam name_loc name;
-super#type_param tparam
+super#type_param ~kind tparam
 
 method! infer_type t =
 let open Ast.Type.Infer in
 let { tparam; comments } = t in
-{ tparam = this#visit_type_param ~from_infer_type:true tparam; comments }
+{
+tparam = this#visit_type_param ~from_infer_type:true ~kind:Flow_ast_mapper.InferTP tparam;
+comments;
+}
 
-method! type_param = this#visit_type_param ~from_infer_type:false
+method! type_param ~kind = this#visit_type_param ~from_infer_type:false ~kind
 
 method! interface loc (interface : ('loc, 'loc) Ast.Statement.Interface.t) =
 let open Ast.Statement.Interface in

@@ -435,18 +435,18 @@ struct
 run this#function_params params;
 run_opt this#predicate predicate
 );
-run_opt this#type_params tparams
+run_opt (this#type_params ~kind:Flow_ast_mapper.FunctionTP) tparams
 
 method component_def (expr : ('loc, 'loc) Ast.Statement.ComponentDeclaration.t) =
 let { Ast.Statement.ComponentDeclaration.params; renders; tparams; _ } = expr in
 run this#component_renders_annotation renders;
 run this#component_params_annotated params;
-run_opt this#type_params tparams
+run_opt (this#type_params ~kind:Flow_ast_mapper.ComponentDeclarationTP) tparams
 
 method! declare_component _ (expr : ('loc, 'loc) Ast.Statement.DeclareComponent.t) =
 let { Ast.Statement.DeclareComponent.params; renders; tparams; _ } = expr in
 run this#component_renders_annotation renders;
-run_opt this#type_params tparams;
+run_opt (this#type_params ~kind:Flow_ast_mapper.DeclareComponentTP) tparams;
 run this#component_type_params params;
 expr
 
@@ -880,7 +880,7 @@ struct
 Base.Option.iter ~f:visitor#class_extends_sig extends;
 run_opt visitor#class_implements implements;
 run_list visitor#class_decorator class_decorators;
-run_opt visitor#type_params tparams;
+run_opt (visitor#type_params ~kind:Flow_ast_mapper.ClassTP) tparams;
 ())
 EnvMap.empty
 in
@@ -896,7 +896,7 @@ struct
 } =
 depends_of_node
 (fun visitor ->
-run_opt visitor#type_params tparams;
+run_opt (visitor#type_params ~kind:Flow_ast_mapper.DeclareClassTP) tparams;
 run_loc visitor#object_type body;
 run_loc_opt visitor#generic_type extends;
 Base.List.iter ~f:(run_loc visitor#generic_type) mixins;
@@ -924,15 +924,15 @@ struct
 let depends_of_alias { Ast.Statement.TypeAlias.tparams; right; _ } =
 depends_of_node
 (fun visitor ->
-run_opt visitor#type_params tparams;
+run_opt (visitor#type_params ~kind:Flow_ast_mapper.TypeAliasTP) tparams;
 run visitor#type_ right;
 ())
 EnvMap.empty
 in
 let depends_of_opaque { Ast.Statement.OpaqueType.tparams; impltype; supertype; _ } =
 depends_of_node
 (fun visitor ->
-run_opt visitor#type_params tparams;
+run_opt (visitor#type_params ~kind:Flow_ast_mapper.OpaqueTypeTP) tparams;
 run_opt visitor#type_ impltype;
 run_opt visitor#type_ supertype;
 ())
@@ -950,7 +950,7 @@ struct
 let depends_of_interface { Ast.Statement.Interface.tparams; extends; body; _ } =
 depends_of_node
 (fun visitor ->
-run_opt visitor#type_params tparams;
+run_opt (visitor#type_params ~kind:Flow_ast_mapper.InterfaceTP) tparams;
 Base.List.iter ~f:(run_loc visitor#generic_type) extends;
 run_loc visitor#object_type body;
 ())

@@ -161,9 +161,9 @@ class selection_range_finder ~position =
 
 method! type_args x = this#test super#type_args x
 
-method! type_params x = this#test super#type_params x
+method! type_params ~kind x = this#test (super#type_params ~kind) x
 
-method! type_param x = this#test super#type_param x
+method! type_param ~kind x = this#test (super#type_param ~kind) x
 
 method! type_ x = this#test super#type_ x
 

@@ -335,7 +335,7 @@ class ['loc] trailing_comments_remover ~after_pos =
 let { comments; _ } = expr in
 id this#syntax_opt comments expr (fun comments' -> { expr with comments = comments' })
 
-method! type_params tparams =
+method! type_params ~kind:_ tparams =
 let open Ast.Type.TypeParams in
 let (loc, { params; comments }) = tparams in
 id this#syntax_opt comments tparams (fun comments' -> (loc, { params; comments = comments' }))
@@ -437,12 +437,12 @@ let block_remove_trailing env block =
 let { remove_trailing; _ } = trailing_and_remover env in
 remove_trailing block (fun remover (loc, str) -> (loc, remover#block loc str))
 
-let type_params_remove_trailing env tparams =
+let type_params_remove_trailing env ~kind tparams =
 match tparams with
 | None -> None
 | Some tparams ->
 let { remove_trailing; _ } = trailing_and_remover env in
-Some (remove_trailing tparams (fun remover tparams -> remover#type_params tparams))
+Some (remove_trailing tparams (fun remover tparams -> remover#type_params ~kind tparams))
 
 let type_remove_trailing env ty =
 let { remove_trailing; _ } = trailing_and_remover env in
@@ -830,9 +830,9 @@ let call_type_arg_comment_bounds loc arg =
 ignore (collector#call_type_arg arg);
 collect_without_trailing_line_comment collector
 
-let type_param_comment_bounds (loc, param) =
+let type_param_comment_bounds ~kind (loc, param) =
 let collector = new comment_bounds_collector ~loc in
-ignore (collector#type_param (loc, param));
+ignore (collector#type_param ~kind (loc, param));
 collect_without_trailing_line_comment collector
 
 let function_body_comment_bounds body =

@@ -331,7 +331,12 @@ module Declaration (Parse : Parser_common.PARSER) (Type : Parser_common.TYPE) :
 match (in_export_default env, Peek.token env) with
 | (true, T_LPAREN) -> (None, None)
 | (true, T_LESS_THAN) ->
-let tparams = type_params_remove_trailing env (Type.type_params env) in
+let tparams =
+type_params_remove_trailing
+env
+~kind:Flow_ast_mapper.DeclareFunctionTP
+(Type.type_params env)
+in
 let id =
 if Peek.token env = T_LPAREN then
 None
@@ -356,7 +361,12 @@ module Declaration (Parse : Parser_common.PARSER) (Type : Parser_common.TYPE) :
 (Peek.loc env, { Identifier.name = ""; comments = None })
 )
 in
-let tparams = type_params_remove_trailing env (Type.type_params env) in
+let tparams =
+type_params_remove_trailing
+env
+~kind:Flow_ast_mapper.DeclareFunctionTP
+(Type.type_params env)
+in
 (tparams, Some id)
 in
 let params =
@@ -596,7 +606,12 @@ module Declaration (Parse : Parser_common.PARSER) (Type : Parser_common.TYPE) :
 (* Components should have at least the same strictness as functions *)
 (Parse.identifier ~restricted_error:Parse_error.StrictFunctionName env)
 in
-let tparams = type_params_remove_trailing env (Type.type_params env) in
+let tparams =
+type_params_remove_trailing
+env
+~kind:Flow_ast_mapper.DeclareComponentTP
+(Type.type_params env)
+in
 let params =
 let params = component_params env in
 if Peek.is_renders_ident env then

@@ -1152,7 +1152,12 @@ module Expression
 in
 Some id
 in
-let tparams = type_params_remove_trailing env (Type.type_params env) in
+let tparams =
+type_params_remove_trailing
+env
+~kind:Flow_ast_mapper.FunctionTP
+(Type.type_params env)
+in
 (id, tparams)
 in
 (* #sec-function-definitions-static-semantics-early-errors *)
@@ -1777,7 +1782,9 @@ module Expression
 let (sig_loc, (tparams, params, return, predicate)) =
 with_loc
 (fun env ->
-let tparams = type_params_remove_trailing env (Type.type_params env) in
+let tparams =
+type_params_remove_trailing env ~kind:Flow_ast_mapper.FunctionTP (Type.type_params env)
+in
 (* Disallow all fancy features for identifier => body *)
 if Peek.is_identifier env && tparams = None then
 let ((loc, _) as name) =