cleanup

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -702,7 +702,6 @@ let getPipeCompletions ~env ~full ~identifierLoc ~debug ~envCompletionIsMadeFrom
           TypeUtils.completionPathFromMaybeBuiltin t ~package:full.package
         | None -> None
       in
-      (* TODO(in-compiler) No need to have this configurable anymore, just use the new integrated modules from Core..*)
       let completionPath =
         match (completeAsBuiltin, typePath) with
         | Some completionPathForBuiltin, _ -> Some completionPathForBuiltin
@@ -1099,22 +1098,11 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
          ~completionContext:Field ~env ~scope
   | CPField {contextPath = cp; fieldName; fieldNameLoc} -> (
     if Debug.verbose () then print_endline "[dot_completion]--> Triggered";
-    (* This finds completions for the context path of the field completion.
-       From this, we assume that the first found completion represents the type
-       of the field parent. So in `someRecordValue.f`, we find the type of `someRecordValue`.
-
-       This procedure is how finding types works in general in the tooling as of
-       now. *)
     let completionsFromCtxPath =
       cp
       |> getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env
            ~exact:true ~scope
     in
-    (* This extracts the type expr and env from the first found completion, if it's
-          a type expr. For dot completion, a type expr is the only relevant type we care
-       about here, since that will point to a type, either record or other type, of which
-       we can look up the module and any annotations for.
-    *)
     let mainTypeCompletionEnv =
       completionsFromCtxPath
       |> completionsGetTypeEnv2 ~debug ~full ~opens ~rawOpens ~pos

analysis/src/DotCompletionUtils.ml

@@ -27,7 +27,7 @@ let fieldCompletionsForDotCompletion typ ~env ~package ~prefix ~fieldNameLoc
            else None)
   | None -> (
     match typ |> TypeUtils.extractRecordType ~env ~package with
-    | Some (env, fields, typDecl, _path, _attributes) ->
+    | Some (env, fields, typDecl) ->
       fields
       |> filterRecordFields ~env ~prefix ~exact
            ~recordAsString:

analysis/src/ProcessAttributes.ml

@@ -49,23 +49,7 @@ let newDeclared ~item ~extent ~name ~stamp ~modulePath isExported attributes =
     item;
   }
 
-let rec findEditorCompleteFromAttribute attributes =
-  let open Parsetree in
-  match attributes with
-  | [] -> None
-  | ( {Asttypes.txt = "editor.completeFrom"},
-      PStr
-        [
-          {
-            pstr_desc =
-              Pstr_eval ({pexp_desc = Pexp_construct ({txt = path}, None)}, _);
-          };
-        ] )
-    :: _ ->
-    Some (Utils.flattenLongIdent path)
-  | _ :: rest -> findEditorCompleteFromAttribute rest
-
-let rec findEditorCompleteFromAttribute2 ?(modulePaths = []) attributes =
+let rec findEditorCompleteFromAttribute ?(modulePaths = []) attributes =
   let open Parsetree in
   match attributes with
   | [] -> modulePaths
@@ -85,7 +69,7 @@ let rec findEditorCompleteFromAttribute2 ?(modulePaths = []) attributes =
                Some (Utils.flattenLongIdent path)
              | _ -> None)
     in
-    findEditorCompleteFromAttribute2
+    findEditorCompleteFromAttribute
       ~modulePaths:(modulePathsFromArray @ modulePaths)
       rest
-  | _ :: rest -> findEditorCompleteFromAttribute2 ~modulePaths rest
+  | _ :: rest -> findEditorCompleteFromAttribute ~modulePaths rest

analysis/src/TypeUtils.ml

@@ -209,7 +209,7 @@ let rec extractRecordType ~env ~package (t : Types.type_expr) =
   | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> extractRecordType ~env ~package t1
   | Tconstr (path, typeArgs, _) -> (
     match References.digConstructor ~env ~package path with
-    | Some (env, ({item = {kind = Record fields; attributes}} as typ)) ->
+    | Some (env, ({item = {kind = Record fields}} as typ)) ->
       let typeParams = typ.item.decl.type_params in
       let fields =
         fields
@@ -219,7 +219,7 @@ let rec extractRecordType ~env ~package (t : Types.type_expr) =
                in
                {field with typ = fieldTyp})
       in
-      Some (env, fields, typ, path, attributes)
+      Some (env, fields, typ)
     | Some
         ( env,
           {item = {decl = {type_manifest = Some t1; type_params = typeParams}}}
@@ -1108,7 +1108,7 @@ module StringSet = Set.Make (String)
 let getExtraModulesToCompleteFromForType ~env ~full (t : Types.type_expr) =
   let foundModulePaths = ref StringSet.empty in
   let addToModulePaths attributes =
-    ProcessAttributes.findEditorCompleteFromAttribute2 attributes
+    ProcessAttributes.findEditorCompleteFromAttribute attributes
     |> List.iter (fun e ->
            foundModulePaths :=
              StringSet.add (e |> String.concat ".") !foundModulePaths)