JS: Also sort files in legacy extractor

Author: asgerf

javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java

@@ -559,6 +559,15 @@ public int compare(Path f1, Path f2) {
     }
   };
 
+  /**
+   * Like {@link #PATH_ORDERING} but for {@link File} objects.
+   */
+  public static final Comparator<File> FILE_ORDERING = new Comparator<File>() {
+    public int compare(File f1, File f2) {
+      return PATH_ORDERING.compare(f1.toPath(), f2.toPath());
+    }
+  };
+
   /** Extract all supported candidate files that pass the filters. */
   private void extractSource() throws IOException {
     // default extractor
@@ -577,11 +586,11 @@ private void extractSource() throws IOException {
     Set<Path> filesToExtract = new LinkedHashSet<>();
     List<Path> tsconfigFiles = new ArrayList<>();
     findFilesToExtract(defaultExtractor, filesToExtract, tsconfigFiles);
-    
+
     tsconfigFiles = tsconfigFiles.stream()
          .sorted(PATH_ORDERING)
          .collect(Collectors.toList());
-    
+
     filesToExtract = filesToExtract.stream()
         .sorted(PATH_ORDERING)
         .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
@@ -695,7 +704,7 @@ private String getChildAsString(JsonObject obj, String name) {
    * @return a path or null
    */
   public static Path tryRelativize(Path from, Path to) {
-    Path relative = from.relativize(to);      
+    Path relative = from.relativize(to);
     if (relative.startsWith("..") || relative.isAbsolute()) {
       return null;
     }

javascript/extractor/src/com/semmle/js/extractor/Main.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import com.semmle.js.extractor.ExtractorConfig.HTMLHandling;
 import com.semmle.js.extractor.ExtractorConfig.Platform;
@@ -77,8 +78,8 @@ public class Main {
   private PathMatcher includeMatcher, excludeMatcher;
   private FileExtractor fileExtractor;
   private ExtractorState extractorState;
-  private final Set<File> projectFiles = new LinkedHashSet<>();
-  private final Set<File> files = new LinkedHashSet<>();
+  private Set<File> projectFiles = new LinkedHashSet<>();
+  private Set<File> files = new LinkedHashSet<>();
   private final Set<File> extractedFiles = new LinkedHashSet<>();
 
   /* used to detect cyclic directory hierarchies */
@@ -138,6 +139,16 @@ public void run(String[] args) {
     if (containsTypeScriptFiles()) {
       tsParser.verifyInstallation(!ap.has(P_QUIET));
     }
+
+    // Sort files for determinism
+    projectFiles = projectFiles.stream()
+          .sorted(AutoBuild.FILE_ORDERING)
+          .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
+
+    files = files.stream()
+        .sorted(AutoBuild.FILE_ORDERING)
+        .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
+
     for (File projectFile : projectFiles) {
 
       long start = verboseLogStartTimer(ap, "Opening project " + projectFile);