Revert other changes and commit test result

Author: nojaf

analysis/src/SharedTypes.ml

@@ -689,20 +689,20 @@ module Completable = struct
     | CPAwait ctxPath -> "await " ^ contextPathToString ctxPath
     | CPOption ctxPath -> "option<" ^ contextPathToString ctxPath ^ ">"
     | CPApply (cp, labels) ->
-      "CPApply(" ^ contextPathToString cp ^ "("
+      contextPathToString cp ^ "("
       ^ (labels
         |> List.map (function
              | Asttypes.Noloc.Nolabel -> "Nolabel"
              | Labelled s -> "~" ^ s
              | Optional s -> "?" ^ s)
         |> String.concat ", ")
-      ^ "))"
+      ^ ")"
     | CPArray (Some ctxPath) -> "array<" ^ contextPathToString ctxPath ^ ">"
     | CPArray None -> "array"
     | CPId {path; completionContext} ->
-      "CPID(" ^ completionContextToString completionContext ^ list path ^ ")"
+      completionContextToString completionContext ^ list path
     | CPField {contextPath = cp; fieldName = s} ->
-      "CPField(" ^ contextPathToString cp ^ "." ^ str s ^ ")"
+      contextPathToString cp ^ "." ^ str s
     | CPObj (cp, s) -> contextPathToString cp ^ "[\"" ^ s ^ "\"]"
     | CPPipe {contextPath; id; inJsx} ->
       contextPathToString contextPath
@@ -801,19 +801,6 @@ module Completion = struct
     | ExtractedType of completionType * [`Value | `Type]
     | FollowContextPath of Completable.contextPath * ScopeTypes.item list
 
-  let kind_to_string = function
-    | Module _ -> "Module"
-    | Value _ -> "Value"
-    | ObjLabel _ -> "ObjLabel"
-    | Label _ -> "Label"
-    | Type _ -> "Type"
-    | Constructor _ -> "Constructor"
-    | PolyvariantConstructor _ -> "PolyvariantConstructor"
-    | Field _ -> "Field"
-    | FileModule _ -> "FileModule"
-    | Snippet _ -> "Snippet"
-    | ExtractedType _ -> "ExtractedType"
-    | FollowContextPath _ -> "FollowContextPath"
   type t = {
     name: string;
     sortText: string option;
@@ -832,10 +819,6 @@ module Completion = struct
         (** Whether this item is an made up, synthetic item or not. *)
   }
 
-  let toString (t : t) : string =
-    Format.sprintf "Completion: %s %s %b" t.name (kind_to_string t.kind)
-      t.synthetic
-
   let create ?(synthetic = false) ?additionalTextEdits ?data ?typeArgContext
       ?(includesSnippets = false) ?insertText ~kind ~env ?sortText ?deprecated
       ?filterText ?detail ?(docstring = []) name =

analysis/src/TypeUtils.ml

@@ -262,13 +262,6 @@ let extractFunctionType ~env ~package typ =
   in
   loop ~env [] typ
 
-let rec extracReturnTypeButDontDoAnyAliasLookup (typ : Types.type_expr) :
-    Types.type_expr =
-  match typ.desc with
-  | Types.Tarrow (_, _t1, t2, _, _) ->
-    extracReturnTypeButDontDoAnyAliasLookup t2
-  | _ -> typ
-
 let extractFunctionTypeWithEnv ~env ~package typ =
   let rec loop ~env acc (t : Types.type_expr) =
     match t.desc with
@@ -515,7 +508,6 @@ let rec digToRelevantTemplateNameType ~env ~package ?(suffix = "")
 
 let rec resolveTypeForPipeCompletion ~env ~package ~lhsLoc ~full
     (t : Types.type_expr) =
-  if Debug.verbose () then print_endline "Enter resolveTypeForPipeCompletion:";
   (* If the type we're completing on is a type parameter, we won't be able to
      do completion unless we know what that type parameter is compiled as.
      This attempts to look up the compiled type for that type parameter by
@@ -1175,7 +1167,7 @@ let transformCompletionToPipeCompletion ?(synthetic = false) ~env ?posOfDot
     of the project. Example: type x in module SomeModule in file SomeFile would get the globally 
     unique id `SomeFile.SomeModule.x`.*)
 let rec findRootTypeId ~full ~env (t : Types.type_expr) =
-  let debug = Debug.verbose () in
+  let debug = false in
   match t.desc with
   | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> findRootTypeId ~full ~env t1
   | Tconstr (path, _, _) -> (
@@ -1216,11 +1208,8 @@ let filterPipeableFunctions ~env ~full ?synthetic ?targetTypeId ?posOfDot
   match targetTypeId with
   | None -> completions
   | Some targetTypeId ->
-    if Debug.verbose () then Format.printf "targetTypeId: %s\n" targetTypeId;
     completions
     |> List.filter_map (fun (completion : Completion.t) ->
-           if Debug.verbose () then
-             print_endline (Completion.toString completion);
            let thisCompletionItemTypeId =
              match completion.kind with
              | Value t -> (