Skip to content

Commit 57133f9

Browse files
author
Max Schaefer
committed
JavaScript: Prevent interleaved progress messages on stdout.
1 parent 1c84dc0 commit 57133f9

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
510510
File projectFile = projectPath.toFile();
511511
long start = logBeginProcess("Opening project " + projectFile);
512512
ParsedProject project = tsParser.openProject(projectFile);
513-
logEndProcess(start);
513+
logEndProcess(start, "Done opening project " + projectFile);
514514
// Extract all files belonging to this project which are also matched
515515
// by our include/exclude filters.
516516
List<File> typeScriptFiles = new ArrayList<File>();
@@ -625,7 +625,7 @@ private void doExtract(FileExtractor extractor, Path file, ExtractorState state)
625625
try {
626626
long start = logBeginProcess("Extracting " + file);
627627
extractor.extract(f, state);
628-
logEndProcess(start);
628+
logEndProcess(start, "Done extracting " + file);
629629
} catch (IOException e) {
630630
throw new ResourceError("Exception while extracting " + file + ".", e);
631631
}
@@ -637,15 +637,14 @@ private void warn(String msg) {
637637
}
638638

639639
private long logBeginProcess(String message) {
640-
System.out.print(message + "...");
641-
System.out.flush();
640+
System.out.println(message);
642641
return System.nanoTime();
643642
}
644643

645-
private void logEndProcess(long timedLogMessageStart) {
644+
private void logEndProcess(long timedLogMessageStart, String message) {
646645
long end = System.nanoTime();
647-
int milliseconds = (int) ((end - timedLogMessageStart) / 1000000);
648-
System.out.println(" done (" + milliseconds + " ms)");
646+
int milliseconds = (int) ((end - timedLogMessageStart) / 1_000_000);
647+
System.out.println(message + " (" + milliseconds + " ms)");
649648
}
650649

651650
public static void main(String[] args) {

0 commit comments

Comments
 (0)