Remove recordAllLocations.

Author: cristianoc

src/rescript-editor-support/NotificationHandlers.re

@@ -14,11 +14,7 @@ let watchedFileContentsMap = Hashtbl.create(100);
 
 let reloadAllState = state => {
   Log.log("RELOADING ALL STATE");
-  {
-    ...TopTypes.empty(),
-    documentText: state.documentText,
-    settings: state.settings,
-  };
+  {...TopTypes.empty(), documentText: state.documentText};
 };
 
 let notificationHandlers:

src/rescript-editor-support/ProcessExtra.re

@@ -87,7 +87,6 @@ module F =
            let extra: extra;
            let file: file;
            let scopeExtent: ref(list(Location.t));
-           let allLocations: bool;
          },
        ) => {
   let extra = Collector.extra;
@@ -470,9 +469,6 @@ module F =
       addForPattern(stamp, name);
     | _ => ()
     };
-    if (Collector.allLocations) {
-      addLocation(pat_loc, Typed(pat_type, NotFound));
-    };
   };
 
   let enter_expression = expression => {
@@ -528,9 +524,6 @@ module F =
       }
     | _ => ()
     };
-    if (Collector.allLocations) {
-      addLocation(expression.exp_loc, Typed(expression.exp_type, NotFound));
-    };
   };
 
   let leave_expression = expression => {
@@ -613,7 +606,7 @@ let forFile = (~file) => {
   extra;
 };
 
-let forItems = (~file, ~allLocations, items, parts) => {
+let forItems = (~file, items, parts) => {
   let extra = forFile(~file);
 
   let extent = ProcessCmt.itemsExtent(items);
@@ -635,7 +628,6 @@ let forItems = (~file, ~allLocations, items, parts) => {
           let scopeExtent = ref([extent]);
           let extra = extra;
           let file = file;
-          let allLocations = allLocations;
         })
       ),
     );
@@ -661,7 +653,7 @@ let forItems = (~file, ~allLocations, items, parts) => {
   extra;
 };
 
-let forCmt = (~file, ~allLocations, {cmt_annots}: Cmt_format.cmt_infos) =>
+let forCmt = (~file, {cmt_annots}: Cmt_format.cmt_infos) =>
   switch (cmt_annots) {
   | Partial_implementation(parts) =>
     let items =
@@ -676,12 +668,10 @@ let forCmt = (~file, ~allLocations, {cmt_annots}: Cmt_format.cmt_infos) =>
            }
          )
       |> List.concat;
-    forItems(~file, ~allLocations, items, parts);
-  | Implementation(structure) =>
-    forItems(~file, ~allLocations, structure.str_items, [||])
+    forItems(~file, items, parts);
+  | Implementation(structure) => forItems(~file, structure.str_items, [||])
   | Partial_interface(_)
   | Interface(_) =>
-    /** TODO actually process signature items */
-    forItems(~file, ~allLocations, [], [||])
-  | _ => forItems(~file, ~allLocations, [], [||])
+    /** TODO actually process signature items */ forItems(~file, [], [||])
+  | _ => forItems(~file, [], [||])
   };

src/rescript-editor-support/Process_406.re

@@ -5,10 +5,10 @@ let fileForCmt = (~moduleName, cmt, uri, processDoc) => {
   Ok(ProcessCmt.forCmt(~moduleName, uri, processDoc, infos));
 };
 
-let fullForCmt = (~moduleName, ~allLocations, cmt, uri, processDoc) => {
+let fullForCmt = (~moduleName, cmt, uri, processDoc) => {
   let%try infos = Shared.tryReadCmt(cmt);
   let file = ProcessCmt.forCmt(~moduleName, uri, processDoc, infos);
-  let extra = ProcessExtra.forCmt(~file, ~allLocations, infos);
+  let extra = ProcessExtra.forCmt(~file, infos);
   Ok({file, extra});
 };
 

src/rescript-editor-support/Process_406.rei

@@ -3,11 +3,5 @@ let fileForCmt:
   result(SharedTypes.file, string);
 
 let fullForCmt:
-  (
-    ~moduleName: string,
-    ~allLocations: bool,
-    string,
-    string,
-    string => string
-  ) =>
+  (~moduleName: string, string, string, string => string) =>
   result(SharedTypes.full, string);

src/rescript-editor-support/State.re

@@ -66,15 +66,7 @@ let getFullFromCmt = (~state, ~uri) => {
   switch (Hashtbl.find_opt(package.pathsForModule, moduleName)) {
   | Some(paths) =>
     let cmt = SharedTypes.getCmt(~interface=Utils.endsWith(uri, "i"), paths);
-    let%try full =
-      Process_406.fullForCmt(
-        ~moduleName,
-        ~allLocations=state.settings.recordAllLocations,
-        cmt,
-        uri,
-        x =>
-        x
-      );
+    let%try full = Process_406.fullForCmt(~moduleName, cmt, uri, x => x);
     Hashtbl.replace(
       package.interModuleDependencies,
       moduleName,

src/rescript-editor-support/TopTypes.re

@@ -16,11 +16,8 @@ type package = {
   opens: list(string),
 };
 
-type settings = {recordAllLocations: bool};
-
 type state = {
   rootUri: uri,
-  settings,
   documentText: Hashtbl.t(uri, (string, int, bool)),
   packagesByRoot: Hashtbl.t(string, package),
   rootForUri: Hashtbl.t(uri, string),
@@ -33,7 +30,4 @@ let empty = () => {
   packagesByRoot: Hashtbl.create(1),
   rootForUri: Hashtbl.create(30),
   cmtCache: Hashtbl.create(30),
-  settings: {
-    recordAllLocations: false,
-  },
 };