regex match and keep output files in order for setFilesToPrintAfterEa…

…chPass option. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=166768019
google · Aug 29, 2017 · d5aa638 · d5aa638
1 parent addd51f
commit d5aa638
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/com/google/javascript/jscomp/Compiler.java b/src/com/google/javascript/jscomp/Compiler.java
@@ -1169,17 +1169,21 @@ final void afterPass(String passName) {
   }
 
   final String getCurrentJsSource() {
-    List<String> filenames = options.filesToPrintAfterEachPass;
-    if (filenames.isEmpty()) {
+    List<String> fileNameRegexList = options.filesToPrintAfterEachPassRegexList;
+    if (fileNameRegexList.isEmpty()) {
       return toSource();
     } else {
       StringBuilder builder = new StringBuilder();
-      for (String filename : filenames) {
-        Node script = getScriptNode(filename);
-        String source = script != null
-            ? "// " + script.getSourceFileName() + "\n" + toSource(script)
-            : "File '" + filename + "' not found";
-        builder.append(source);
+      checkNotNull(jsRoot);
+      for (Node fileNode : jsRoot.children()) {
+        String fileName = fileNode.getSourceFileName();
+        for (String regex : fileNameRegexList) {
+          if (fileName.matches(regex)) {
+            String source = "// " + fileName + "\n" + toSource(fileNode);
+            builder.append(source);
+            break;
+          }
+        }
       }
       return builder.toString();
     }

diff --git a/src/com/google/javascript/jscomp/CompilerOptions.java b/src/com/google/javascript/jscomp/CompilerOptions.java
@@ -983,14 +983,14 @@ public void setTrustedStrings(boolean yes) {
   boolean printSourceAfterEachPass;
   // Used to narrow down the printed source when overall input size is large. If this is empty,
   // the entire source is printed.
-  List<String> filesToPrintAfterEachPass = ImmutableList.of();
+  List<String> filesToPrintAfterEachPassRegexList = ImmutableList.of();
 
   public void setPrintSourceAfterEachPass(boolean printSource) {
     this.printSourceAfterEachPass = printSource;
   }
 
-  public void setFilesToPrintAfterEachPass(List<String> filenames) {
-    this.filesToPrintAfterEachPass = filenames;
+  public void setFilesToPrintAfterEachPassRegexList(List<String> filePathRegexList) {
+    this.filesToPrintAfterEachPassRegexList = filePathRegexList;
   }
 
   String reportPath;