From 57133f91ffe69bf58d87259236146f53c59f7b3d Mon Sep 17 00:00:00 2001 From: Max Schaefer Date: Wed, 14 Nov 2018 14:42:25 +0000 Subject: [PATCH] JavaScript: Prevent interleaved progress messages on stdout. --- .../src/com/semmle/js/extractor/AutoBuild.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java index d0cd441f93f..7c61827f5ca 100644 --- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java +++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java @@ -510,7 +510,7 @@ public class AutoBuild { File projectFile = projectPath.toFile(); long start = logBeginProcess("Opening project " + projectFile); ParsedProject project = tsParser.openProject(projectFile); - logEndProcess(start); + logEndProcess(start, "Done opening project " + projectFile); // Extract all files belonging to this project which are also matched // by our include/exclude filters. List typeScriptFiles = new ArrayList(); @@ -625,7 +625,7 @@ public class AutoBuild { try { long start = logBeginProcess("Extracting " + file); extractor.extract(f, state); - logEndProcess(start); + logEndProcess(start, "Done extracting " + file); } catch (IOException e) { throw new ResourceError("Exception while extracting " + file + ".", e); } @@ -637,15 +637,14 @@ public class AutoBuild { } private long logBeginProcess(String message) { - System.out.print(message + "..."); - System.out.flush(); + System.out.println(message); return System.nanoTime(); } - private void logEndProcess(long timedLogMessageStart) { + private void logEndProcess(long timedLogMessageStart, String message) { long end = System.nanoTime(); - int milliseconds = (int) ((end - timedLogMessageStart) / 1000000); - System.out.println(" done (" + milliseconds + " ms)"); + int milliseconds = (int) ((end - timedLogMessageStart) / 1_000_000); + System.out.println(message + " (" + milliseconds + " ms)"); } public static void main(String[] args) {