Omit like types in decl hover

Summary:
Currently we show like types (from pessimisation) even for "decl" types such as that shown when hovering over calls to functions. This is not very helpful, especially now that we're employing more clever pessimisation e.g. putting likes on parameter types in order to prevent like-propagation through to enforced returns. For this case, let's omit the likes. e.g. show
 {F1983163734}
and not
 {F1983170217}

Reviewed By: madgen

Differential Revision: D85961760

fbshipit-source-id: c031eb41aba8f700ee0e07430572c72aa1362765

Author: Andrew Kennedy

hphp/hack/src/typing/tast_env.ml

@@ -55,6 +55,7 @@ let print_ty_with_identity env ty sym_occurrence sym_definition =
 let print_decl_ty_with_identity env ty sym_occurrence sym_definition =
   Typing_print.full_decl_with_identity
     ~verbose_fun:false
+    ~omit_likes:true
     env
     ty
     sym_occurrence

hphp/hack/src/typing/typing_print.ml

@@ -812,14 +812,28 @@ module Full = struct
   (* Prints a decl_ty. If there isn't enough fuel, the type is omitted. Each
      recursive call to print a type depletes the fuel by one. *)
   let rec decl_ty ~fuel :
-      _ -> _ -> _ -> verbose_fun:bool -> decl_ty -> Fuel.t * Doc.t =
-   fun to_doc st penv ~verbose_fun x ->
-    Fuel.provide fuel (decl_ty_ to_doc st penv ~verbose_fun (get_node x))
+      _ ->
+      _ ->
+      _ ->
+      verbose_fun:bool ->
+      omit_likes:bool ->
+      decl_ty ->
+      Fuel.t * Doc.t =
+   fun to_doc st penv ~verbose_fun ~omit_likes x ->
+    Fuel.provide
+      fuel
+      (decl_ty_ to_doc st penv ~verbose_fun ~omit_likes (get_node x))
 
   and decl_ty_ ~fuel :
-      _ -> _ -> _ -> verbose_fun:bool -> decl_phase ty_ -> Fuel.t * Doc.t =
-   fun to_doc st penv ~verbose_fun x ->
-    let ty = decl_ty ~verbose_fun in
+      _ ->
+      _ ->
+      _ ->
+      verbose_fun:bool ->
+      omit_likes:bool ->
+      decl_phase ty_ ->
+      Fuel.t * Doc.t =
+   fun to_doc st penv ~verbose_fun ~omit_likes x ->
+    let ty = decl_ty ~verbose_fun ~omit_likes in
     let k ~fuel x = ty ~fuel to_doc st penv x in
     match x with
     | Tany _ -> (fuel, text "_")
@@ -845,7 +859,12 @@ module Full = struct
       (fuel, option_doc)
     | Tlike x ->
       let (fuel, ty_doc) = k ~fuel x in
-      let like_doc = Concat [text "~"; ty_doc] in
+      let like_doc =
+        if omit_likes then
+          ty_doc
+        else
+          Concat [text "~"; ty_doc]
+      in
       (fuel, like_doc)
     | Tprim x -> (fuel, tprim x)
     | Tfun ft ->
@@ -857,7 +876,7 @@ module Full = struct
         penv
         ~verbose:verbose_fun
         ft
-        (fun_decl_implicit_params ~verbose_fun)
+        (fun_decl_implicit_params ~verbose_fun ~omit_likes)
     | Tapply ((_, n), [ty])
       when String.equal n SN.Classes.cSupportDyn
            && not (show_supportdyn_penv penv) ->
@@ -900,9 +919,9 @@ module Full = struct
       let class_ptr_doc = Concat [text "class<"; ty_doc; text ">"] in
       (fuel, class_ptr_doc)
 
-  and fun_decl_implicit_params ~fuel ~verbose_fun =
+  and fun_decl_implicit_params ~fuel ~verbose_fun ~omit_likes =
     fun_implicit_params
-      (decl_ty ~verbose_fun)
+      (decl_ty ~verbose_fun ~omit_likes)
       (Typing_make_type.default_capability_decl Pos_or_decl.none)
       ~fuel
 
@@ -1456,7 +1475,7 @@ module Full = struct
     to_string ~fuel ~ty text_strip_ns env x
 
   let to_string_decl ~fuel (x : decl_ty) =
-    let ty = decl_ty ~verbose_fun:false in
+    let ty = decl_ty ~verbose_fun:false ~omit_likes:false in
     to_string ~fuel ~ty Doc.text Declenv x
 
   (** For functions and methods, interpret supportdyn as use of <<__SupportDynamicType>> attribute *)
@@ -1620,12 +1639,13 @@ module Full = struct
       definition_opt
 
   let to_string_decl_with_identity
-      ~fuel ~verbose_fun env (x : decl_ty) occurrence definition_opt =
+      ~fuel ~verbose_fun ~omit_likes env (x : decl_ty) occurrence definition_opt
+      =
     to_string_with_identity
       ~fuel
       env
       x
-      (decl_ty ~verbose_fun)
+      (decl_ty ~verbose_fun ~omit_likes)
       ~default_capability:
         (Typing_make_type.default_capability_decl Pos_or_decl.none)
       ~constraints:Nothing
@@ -1903,7 +1923,10 @@ let full_strip_ns_decl ?(msg = true) ~verbose_fun env ty =
   supply_fuel
     ~msg
     env.genv.tcopt
-    (Full.to_string_strip_ns ~ty:(Full.decl_ty ~verbose_fun) (Loclenv env) ty)
+    (Full.to_string_strip_ns
+       ~ty:(Full.decl_ty ~verbose_fun ~omit_likes:false)
+       (Loclenv env)
+       ty)
 
 let full_with_identity ~hide_internals env x occurrence definition_opt =
   supply_fuel
@@ -1915,11 +1938,13 @@ let full_with_identity ~hide_internals env x occurrence definition_opt =
        occurrence
        definition_opt)
 
-let full_decl_with_identity env ~verbose_fun x occurrence definition_opt =
+let full_decl_with_identity
+    env ~omit_likes ~verbose_fun x occurrence definition_opt =
   supply_fuel
     env.genv.tcopt
     (Full.to_string_decl_with_identity
        ~verbose_fun
+       ~omit_likes
        env
        x
        occurrence

hphp/hack/src/typing/typing_print.mli

@@ -55,6 +55,7 @@ val full_with_identity :
 (** Pretty print a type and all of its associated declaration information. *)
 val full_decl_with_identity :
   env ->
+  omit_likes:bool ->
   verbose_fun:bool ->
   Typing_defs.decl_ty ->
   'b SymbolOccurrence.t ->

hphp/hack/test/hover/ctx.php.exp

@@ -4,7 +4,7 @@ function any<T>(
   Traversable<T> $traversable,
   optional ?(function(
     T
-  )[T/[ctx $predicate]]: ~bool) $predicate
+  )[T/[ctx $predicate]]: bool) $predicate
 )[T/[ctx $predicate]ctx $predicate]: bool
 ---
 Instantiation:

hphp/hack/test/hover/enum_class_label_argument.php.exp

@@ -1,7 +1,7 @@
 function app<Ta, Tr>(
   HH\EnumClass\Label<Funcs, Func<Ta, Tr>> $l,
   Ta $arg
-): ~Tr
+): Tr
 ---
 Instantiation:
   Ta = (int, int);

hphp/hack/test/hover/enum_class_label_argument2.php.exp

@@ -1,7 +1,7 @@
 function app<Ta, Tr>(
   HH\EnumClass\Label<Funcs, Func<Ta, Tr>> $l,
   Ta $arg
-): ~Tr
+): Tr
 ---
 Instantiation:
   Ta = (int, int);

hphp/hack/test/hover/enum_class_label_argument3.php.exp

@@ -1,7 +1,7 @@
 function app<Ta, Tr>(
   HH\EnumClass\Label<Funcs, Func<Ta, Tr>> $l,
   Ta $arg
-): ~Tr
+): Tr
 ---
 Instantiation:
   Ta = (int, int);

hphp/hack/test/hover/enum_class_label_argument4.php.exp

@@ -3,7 +3,7 @@ Defined in `CL`
 public function app<Ta, Tr>(
   HH\EnumClass\Label<Funcs, Func<Ta, Tr>> $l,
   Ta $arg
-): ~Tr
+): Tr
 ---
 Instantiation:
   Ta = (int, int);

hphp/hack/test/hover/expression_tree_call.php.exp

@@ -1,7 +1,7 @@
 async function bar(ExampleContext $_): Awaitable<
-  ~ExprTree<
+  ExprTree<
     ExampleDsl,
     ExampleDsl::TAst,
-    (function(ExampleString): ~ExampleInt)
+    (function(ExampleString): ExampleInt)
   >
 >

hphp/hack/test/hover/expression_tree_splice_compound2.php.exp

@@ -1,4 +1,4 @@
-function from(string $_): ~ExprTree<
+function from(string $_): ExprTree<
   ExampleDsl,
   ExampleDsl::TAst,
   ExampleString
@@ -16,6 +16,4 @@ Defined in `ExampleDsl`
 public static function lift<
   THack as TInfer as ?ExampleAutoLiftable,
   TInfer
->(ExampleUnion<THack, TInfer> $e): ~ExampleExpression<
-  TInfer
->
+>(ExampleUnion<THack, TInfer> $e): ExampleExpression<TInfer>