cleanup

Author: zth

analysis/src/DumpAst.ml

@@ -59,10 +59,10 @@ let printCoreType typ ~pos =
   match typ.ptyp_desc with
   | Ptyp_any -> "Ptyp_any"
   | Ptyp_var name -> "Ptyp_var(" ^ str name ^ ")"
-  | Ptyp_constr (loc, _types) ->
+  | Ptyp_constr (lid, _types) ->
     "Ptyp_constr("
-    ^ (loc |> printLocDenominatorLoc ~pos)
-    ^ (Utils.flattenLongIdent loc.txt |> ident |> str)
+    ^ (lid |> printLocDenominatorLoc ~pos)
+    ^ (Utils.flattenLongIdent lid.txt |> ident |> str)
     ^ ")"
   | Ptyp_variant _ -> "Ptyp_variant(<unimplemented>)"
   | _ -> "<unimplemented_ptyp_desc>"

analysis/src/ProcessCmt.ml

@@ -64,7 +64,7 @@ let rec forTypeSignatureItem ~(env : SharedTypes.Env.t) ~(exported : Exported.t)
         ~item:
           {
             Type.decl;
-            name = ident.name;
+            name = name.txt;
             kind =
               (match type_kind with
               | Type_abstract -> (

analysis/src/TypeUtils.ml

@@ -381,8 +381,8 @@ let typeIsUnit (typ : Types.type_expr) =
 
 let contextPathFromCoreType (coreType : Parsetree.core_type) =
   match coreType.ptyp_desc with
-  | Ptyp_constr (loc, []) ->
-    Some (Completable.CPId (loc.txt |> Utils.flattenLongIdent, Type))
+  | Ptyp_constr (lid, []) ->
+    Some (Completable.CPId (lid.txt |> Utils.flattenLongIdent, Type))
   | _ -> None
 
 let printRecordFromFields ?name (fields : field list) =