Remove processDoc and all the resulting dead code.

Author: cristianoc

analysis/src/Infix.ml

@@ -3,7 +3,8 @@
  * You provide a function that turns an element into an optional of another element,
  * and you get a list of all of the present results.
  *)
-let optMap : ('a -> 'b option) -> 'a list -> 'b list = fun fn items ->
+let optMap : ('a -> 'b option) -> 'a list -> 'b list =
+ fun fn items ->
   List.fold_left
     (fun result item ->
       match fn item with None -> result | Some res -> res :: result)
@@ -19,8 +20,6 @@ let ( |?> ) o fn = match o with None -> None | Some v -> fn v
 
 let ( |?>> ) o fn = match o with None -> None | Some v -> Some (fn v)
 
-let fold o d f = match o with None -> d | Some v -> f v
-
 let logIfAbsent message x =
   match x with
   | None ->

analysis/src/ProcessAttributes.ml

@@ -34,8 +34,8 @@ let rec findDeprecatedAttribute attributes =
   | ({Asttypes.txt = "deprecated"}, _) :: _ -> Some ""
   | _ :: rest -> findDeprecatedAttribute rest
 
-let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath ~processDoc
-    exported attributes =
+let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath exported
+    attributes =
   {
     name;
     stamp;
@@ -45,10 +45,6 @@ let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath ~processDoc
     modulePath;
     deprecated = findDeprecatedAttribute attributes;
     docstring =
-      ( match findDocAttribute attributes with
-      | None -> []
-      | Some d -> processDoc d );
+      (match findDocAttribute attributes with None -> [] | Some d -> [d]);
     item;
-    (* scopeType = Let; *)
-    (* scopeStart = env.scopeStart; *)
   }

analysis/src/ProcessCmt.ml

@@ -31,12 +31,7 @@ let sigItemsExtent items =
       loc_end = last.sig_loc.loc_end;
     }
 
-type env = {
-  stamps : stamps;
-  processDoc : string -> string list;
-  modulePath : visibilityPath;
-  scope : Location.t;
-}
+type env = {stamps : stamps; modulePath : visibilityPath; scope : Location.t}
 
 let addItem ~name ~extent ~stamp ~env ~item attributes exported stamps =
   let declared =
@@ -47,7 +42,7 @@ let addItem ~name ~extent ~stamp ~env ~item attributes exported stamps =
           loc_end = env.scope.loc_end;
           loc_ghost = false;
         }
-      ~extent ~name ~stamp ~modulePath:env.modulePath ~processDoc:env.processDoc
+      ~extent ~name ~stamp ~modulePath:env.modulePath
       (not (Hashtbl.mem exported name.txt))
       attributes
   in
@@ -117,8 +112,7 @@ let rec forSignatureTypeItem env (exported : SharedTypes.exported) item =
                                }
                              ~name:(Location.mknoloc name)
                              ~stamp (* TODO maybe this needs another child *)
-                             ~modulePath:env.modulePath
-                             ~processDoc:env.processDoc true cd_attributes
+                             ~modulePath:env.modulePath true cd_attributes
                          in
                          Hashtbl.add env.stamps.constructors stamp declared;
                          item))
@@ -291,7 +285,7 @@ let forSignature ~env items =
   let docstring =
     match ProcessAttributes.findDocAttribute attributes with
     | None -> []
-    | Some d -> env.processDoc d
+    | Some d -> [d]
   in
   {docstring; exported; topLevel}
 
@@ -402,8 +396,7 @@ and forModule env mod_desc moduleName =
                 loc_end = env.scope.loc_end;
                 loc_ghost = false;
               }
-            ~extent:t.Typedtree.mty_loc ~stamp ~modulePath:NotVisible
-            ~processDoc:env.processDoc false []
+            ~extent:t.Typedtree.mty_loc ~stamp ~modulePath:NotVisible false []
         in
         Hashtbl.add env.stamps.modules stamp declared));
     forModule env resultExpr.mod_desc moduleName
@@ -441,12 +434,11 @@ and forStructure ~env items =
   let docstring =
     match ProcessAttributes.findDocAttribute attributes with
     | None -> []
-    | Some d -> env.processDoc d
+    | Some d -> [d]
   in
   {docstring; exported; topLevel}
 
-let forCmt ~moduleName ~uri processDoc
-    ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
+let forCmt ~moduleName ~uri ({cmt_modname; cmt_annots} : Cmt_format.cmt_infos) =
   match cmt_annots with
   | Partial_implementation parts ->
     let items =
@@ -474,7 +466,6 @@ let forCmt ~moduleName ~uri processDoc
       {
         scope = extent;
         stamps = initStamps ();
-        processDoc;
         modulePath = File (uri, moduleName);
       }
     in
@@ -494,7 +485,6 @@ let forCmt ~moduleName ~uri processDoc
       {
         scope = sigItemsExtent items;
         stamps = initStamps ();
-        processDoc;
         modulePath = File (uri, moduleName);
       }
     in
@@ -505,7 +495,6 @@ let forCmt ~moduleName ~uri processDoc
       {
         scope = itemsExtent structure.str_items;
         stamps = initStamps ();
-        processDoc;
         modulePath = File (uri, moduleName);
       }
     in
@@ -516,7 +505,6 @@ let forCmt ~moduleName ~uri processDoc
       {
         scope = sigItemsExtent signature.sig_items;
         stamps = initStamps ();
-        processDoc;
         modulePath = File (uri, moduleName);
       }
     in

analysis/src/ProcessExtra.ml

@@ -344,7 +344,6 @@ struct
                 loc_end = (currentScopeExtent ()).loc_end;
               }
             ~modulePath:NotVisible
-            ~processDoc:(fun x -> [x])
             ~item:val_desc.ctyp_type false val_attributes
         in
         Hashtbl.add Collector.file.stamps.values stamp declared;
@@ -372,7 +371,6 @@ struct
                 loc_end = (currentScopeExtent ()).loc_end;
               }
             ~modulePath:NotVisible ~extent:pat_loc
-            ~processDoc:(fun x -> [x])
             ~item:pat_type false pat_attributes
         in
         Hashtbl.add Collector.file.stamps.values stamp declared;

analysis/src/Process_406.ml

@@ -1,16 +1,14 @@
-open SharedTypes
-
-let fileForCmt ~moduleName ~uri cmt processDoc =
+let fileForCmt ~moduleName ~uri cmt =
   match Shared.tryReadCmt cmt with
   | Error e -> Error e
-  | Ok infos -> Ok (ProcessCmt.forCmt ~moduleName ~uri processDoc infos)
+  | Ok infos -> Ok (ProcessCmt.forCmt ~moduleName ~uri infos)
 
-let fullForCmt ~moduleName ~uri cmt processDoc =
+let fullForCmt ~moduleName ~uri cmt =
   match Shared.tryReadCmt cmt with
   | Error e -> Error e
   | Ok infos ->
-    let file = ProcessCmt.forCmt ~moduleName ~uri processDoc infos in
+    let file = ProcessCmt.forCmt ~moduleName ~uri infos in
     let extra = ProcessExtra.forCmt ~file infos in
-    Ok {file; extra}
+    Ok {SharedTypes.file; extra}
 
 module PrintType = PrintType

analysis/src/Process_406.mli

@@ -1,13 +1,5 @@
 val fileForCmt :
-  moduleName:string ->
-  uri:Uri2.t ->
-  string ->
-  (string -> string list) ->
-  (SharedTypes.file, string) result
+  moduleName:string -> uri:Uri2.t -> string -> (SharedTypes.file, string) result
 
 val fullForCmt :
-  moduleName:string ->
-  uri:Uri2.t ->
-  string ->
-  (string -> string list) ->
-  (SharedTypes.full, string) result
+  moduleName:string -> uri:Uri2.t -> string -> (SharedTypes.full, string) result

analysis/src/State.ml

@@ -1,15 +1,7 @@
-let isMl path =
-  Filename.check_suffix path ".ml" || Filename.check_suffix path ".mli"
-
-let converter src =
-  let mlToOutput s = [s] in
-  Infix.fold src mlToOutput (fun src ->
-      match isMl src with true -> mlToOutput | false -> fun x -> [x])
-
 let newDocsForCmt ~moduleName cmtCache changed cmt src =
   let open Infix in
   let uri = Uri2.fromPath (src |? cmt) in
-  match Process_406.fileForCmt ~moduleName ~uri cmt (converter src) with
+  match Process_406.fileForCmt ~moduleName ~uri cmt with
   | Error e ->
     Log.log e;
     None
@@ -51,7 +43,7 @@ let getFullFromCmt ~state ~uri =
     match Hashtbl.find_opt package.pathsForModule moduleName with
     | Some paths -> (
       let cmt = SharedTypes.getCmt ~interface:(Utils.endsWith path "i") paths in
-      match Process_406.fullForCmt ~moduleName ~uri cmt (fun x -> [x]) with
+      match Process_406.fullForCmt ~moduleName ~uri cmt with
       | Error e -> Error e
       | Ok full ->
         Hashtbl.replace package.interModuleDependencies moduleName