fixed lazy_seq logic

facebook · Sep 24, 2019 · 0171bd9 · 0171bd9
1 parent 1069672
commit 0171bd9
Showing 1 changed file with 18 additions and 31 deletions.
diff --git a/src/services/inference/module/module_js.ml b/src/services/inference/module/module_js.ml
@@ -416,37 +416,24 @@ module Node = struct
       [
         lazy
           ( if SSet.mem dir node_modules_containers then
-            lazy_seq([
-              lazy (
-                lazy_seq
-                  ( Files.node_resolver_aliases file_options
-                  |> Core_list.map ~f:(fun dirname ->
-                        let modified_dirname =
-                          dirname
-                          |> Str.split_delim Files.project_root_token
-                          |> String.concat root
-                        in
-                        lazy
-                          (resolve_relative
-                            ~options
-                            ~reader
-                            loc
-                            ?resolution_acc
-                            dir (spf "%s%s%s" modified_dirname Filename.dir_sep r))) )
-              );
-              lazy (
-                lazy_seq
-                  ( Files.node_resolver_dirnames file_options
-                  |> Core_list.map ~f:(fun dirname ->
-                        lazy
-                          (resolve_relative
-                            ~options
-                            ~reader
-                            loc
-                            ?resolution_acc
-                            dir (spf "%s%s%s" dirname Filename.dir_sep r))) )
-              );
-            ])
+            let dirs_to_resolve =
+              Files.node_resolver_aliases file_options
+              @ Files.node_resolver_dirnames file_options
+            in
+            lazy_seq
+              ( dirs_to_resolve |> Core_list.map ~f:(fun dirname ->
+                    let modified_dirname =
+                      dirname
+                      |> Str.split_delim Files.project_root_token
+                      |> String.concat root
+                    in
+                    lazy
+                      (resolve_relative
+                        ~options
+                        ~reader
+                        loc
+                        ?resolution_acc
+                        dir (spf "%s%s%s" modified_dirname Filename.dir_sep r))) )
           else None
         );