findProjectFiles: make dirs and files deterministic.

Author: cristianoc

analysis/src/FindFiles.ml

@@ -1,6 +1,4 @@
-let ifDebug debug name fn v =
-  if debug then Log.log (name ^ ": " ^ fn v);
-  v
+let ifDebug debug name fn v = if debug then Log.log (name ^ ": " ^ fn v)
 
 let ( /+ ) = Filename.concat
 
@@ -122,24 +120,31 @@ let collectFiles directory =
 
 (* returns a list of (absolute path to cmt(i), relative path from base to source file) *)
 let findProjectFiles ~namespace ~path ~sourceDirectories ~libBs =
+  let module StringSet = Set.Make (String) in
+  let dirs =
+    sourceDirectories |> List.map (Filename.concat path) |> StringSet.of_list
+  in
   let files =
-    sourceDirectories
-    |> List.map (Filename.concat path)
-    |> ifDebug true "Source directories" (String.concat " - ")
+    dirs |> StringSet.elements
     |> List.map (fun name -> Files.collect name isSourceFile)
-    |> List.concat |> Utils.dedup
-    |> ifDebug true "Source files found" (String.concat " : ")
+    |> List.concat |> StringSet.of_list
   in
+  dirs
+  |> ifDebug true "Source directories" (fun s ->
+         s |> StringSet.elements |> String.concat " - ");
+  files
+  |> ifDebug true "Source files found" (fun s ->
+         s |> StringSet.elements |> String.concat " : ");
 
   let interfaces = Hashtbl.create 100 in
   files
-  |> List.iter (fun path ->
+  |> StringSet.iter (fun path ->
          if isInterface path then (
            Log.log ("Adding intf " ^ path);
            Hashtbl.replace interfaces (getName path) path));
 
   let normals =
-    files
+    files |> StringSet.elements
     |> Utils.filterMap (fun file ->
            if isImplementation file then (
              let moduleName = getName file in

analysis/tests/src/expected/Debug.res.txt

@@ -5,58 +5,58 @@ Deps @rescript/react
 Dep loc tests/node_modules/@rescript/react/bsconfig.json
 Compiled base: tests/node_modules/@rescript/react/lib/bs
 Source directories: tests/node_modules/@rescript/react/./src - tests/node_modules/@rescript/react/./src/legacy
-Source files found: tests/node_modules/@rescript/react/./src/ReactEvent.resi : tests/node_modules/@rescript/react/./src/RescriptReactErrorBoundary.resi : tests/node_modules/@rescript/react/./src/RescriptReactErrorBoundary.res : tests/node_modules/@rescript/react/./src/ReactDOMStyle.res : tests/node_modules/@rescript/react/./src/ReactTestUtils.resi : tests/node_modules/@rescript/react/./src/legacy/ReactDOMRe.res : tests/node_modules/@rescript/react/./src/legacy/ReasonReact.res : tests/node_modules/@rescript/react/./src/RescriptReactRouter.res : tests/node_modules/@rescript/react/./src/RescriptReactRouter.resi : tests/node_modules/@rescript/react/./src/ReactDOMServer.res : tests/node_modules/@rescript/react/./src/ReactEvent.res : tests/node_modules/@rescript/react/./src/ReactDOM.res : tests/node_modules/@rescript/react/./src/React.res : tests/node_modules/@rescript/react/./src/ReactTestUtils.res
+Source files found: tests/node_modules/@rescript/react/./src/React.res : tests/node_modules/@rescript/react/./src/ReactDOM.res : tests/node_modules/@rescript/react/./src/ReactDOMServer.res : tests/node_modules/@rescript/react/./src/ReactDOMStyle.res : tests/node_modules/@rescript/react/./src/ReactEvent.res : tests/node_modules/@rescript/react/./src/ReactEvent.resi : tests/node_modules/@rescript/react/./src/ReactTestUtils.res : tests/node_modules/@rescript/react/./src/ReactTestUtils.resi : tests/node_modules/@rescript/react/./src/RescriptReactErrorBoundary.res : tests/node_modules/@rescript/react/./src/RescriptReactErrorBoundary.resi : tests/node_modules/@rescript/react/./src/RescriptReactRouter.res : tests/node_modules/@rescript/react/./src/RescriptReactRouter.resi : tests/node_modules/@rescript/react/./src/legacy/ReactDOMRe.res : tests/node_modules/@rescript/react/./src/legacy/ReasonReact.res
 Adding intf tests/node_modules/@rescript/react/./src/ReactEvent.resi
-Adding intf tests/node_modules/@rescript/react/./src/RescriptReactErrorBoundary.resi
 Adding intf tests/node_modules/@rescript/react/./src/ReactTestUtils.resi
+Adding intf tests/node_modules/@rescript/react/./src/RescriptReactErrorBoundary.resi
 Adding intf tests/node_modules/@rescript/react/./src/RescriptReactRouter.resi
 Got source directories src
 Source directories: tests/src
-Source files found: tests/src/DefinitionWithInterface.res : tests/src/Div.res : tests/src/Definition.res : tests/src/Debug.res : tests/src/RenameWithInterface.res : tests/src/ReferencesWithInterface.resi : tests/src/Jsx.resi : tests/src/DefinitionWithInterface.resi : tests/src/Rename.res : tests/src/Auto.res : tests/src/RenameWithInterface.resi : tests/src/RecModules.res : tests/src/Hover.res : tests/src/TypeDefinition.res : tests/src/Completion.res : tests/src/Cross.res : tests/src/Patterns.res : tests/src/RecordCompletion.res : tests/src/Component.resi : tests/src/Jsx.res : tests/src/References.res : tests/src/Component.res : tests/src/Fragment.res : tests/src/ReferencesWithInterface.res
-Adding intf tests/src/ReferencesWithInterface.resi
-Adding intf tests/src/Jsx.resi
+Source files found: tests/src/Auto.res : tests/src/Completion.res : tests/src/Component.res : tests/src/Component.resi : tests/src/Cross.res : tests/src/Debug.res : tests/src/Definition.res : tests/src/DefinitionWithInterface.res : tests/src/DefinitionWithInterface.resi : tests/src/Div.res : tests/src/Fragment.res : tests/src/Hover.res : tests/src/Jsx.res : tests/src/Jsx.resi : tests/src/Patterns.res : tests/src/RecModules.res : tests/src/RecordCompletion.res : tests/src/References.res : tests/src/ReferencesWithInterface.res : tests/src/ReferencesWithInterface.resi : tests/src/Rename.res : tests/src/RenameWithInterface.res : tests/src/RenameWithInterface.resi : tests/src/TypeDefinition.res
+Adding intf tests/src/Component.resi
 Adding intf tests/src/DefinitionWithInterface.resi
+Adding intf tests/src/Jsx.resi
+Adding intf tests/src/ReferencesWithInterface.resi
 Adding intf tests/src/RenameWithInterface.resi
-Adding intf tests/src/Component.resi
 -- All project files found: 19
-DefinitionWithInterface
-Both
-Div
-impl tests/lib/bs/./src/Div.cmt
-Definition
-impl tests/lib/bs/./src/Definition.cmt
-Debug
-impl tests/lib/bs/./src/Debug.cmt
-RenameWithInterface
-Both
-Rename
-impl tests/lib/bs/./src/Rename.cmt
 Auto
 impl tests/lib/bs/./src/Auto.cmt
-RecModules
-impl tests/lib/bs/./src/RecModules.cmt
-Hover
-impl tests/lib/bs/./src/Hover.cmt
-TypeDefinition
-impl tests/lib/bs/./src/TypeDefinition.cmt
 Completion
 impl tests/lib/bs/./src/Completion.cmt
+Component
+Both
 Cross
 impl tests/lib/bs/./src/Cross.cmt
+Debug
+impl tests/lib/bs/./src/Debug.cmt
+Definition
+impl tests/lib/bs/./src/Definition.cmt
+DefinitionWithInterface
+Both
+Div
+impl tests/lib/bs/./src/Div.cmt
+Fragment
+impl tests/lib/bs/./src/Fragment.cmt
+Hover
+impl tests/lib/bs/./src/Hover.cmt
+Jsx
+Both
 Patterns
 impl tests/lib/bs/./src/Patterns.cmt
+RecModules
+impl tests/lib/bs/./src/RecModules.cmt
 RecordCompletion
 impl tests/lib/bs/./src/RecordCompletion.cmt
-Jsx
-Both
 References
 impl tests/lib/bs/./src/References.cmt
-Component
-Both
-Fragment
-impl tests/lib/bs/./src/Fragment.cmt
 ReferencesWithInterface
 Both
+Rename
+impl tests/lib/bs/./src/Rename.cmt
+RenameWithInterface
+Both
+TypeDefinition
+impl tests/lib/bs/./src/TypeDefinition.cmt
 Dependency dirs tests/node_modules/@rescript/react/lib/bs/./src tests/node_modules/@rescript/react/lib/bs/./src/legacy
 Opens from bsconfig: 
 locItems: