add completion message

Author: rauhul

Sources/Basics/ProgressAnimation/Concrete/BlastProgressAnimation.swift

@@ -103,8 +103,8 @@ extension BlastProgressAnimation: ProgressAnimationProtocol {
         self._flush()
     }
 
-    func complete() {
-        self._complete()
+    func complete(_ message: String?) {
+        self._complete(message)
         self._flush()
     }
 }
@@ -151,13 +151,17 @@ extension BlastProgressAnimation {
         self.terminal.text(styles: .reset)
     }
 
+    func _drawMessage(_ message: String?) {
+        if let message {
+            self.terminal.write(" ")
+            self.terminal.write(message)
+        }
+    }
+
     func _draw() {
         assert(self.drawnLines == 0)
         self._drawStates()
-        if let header = self.header {
-            self.terminal.write(" ")
-            self.terminal.write(header)
-        }
+        self._drawMessage(self.header)
         self.drawnLines += 1
         let tasks = self.state.tasks.values.filter { $0.state == .started }.sorted()
         for task in tasks {
@@ -167,9 +171,10 @@ extension BlastProgressAnimation {
         }
     }
 
-    func _complete() {
+    func _complete(_ message: String?) {
         self._clear()
         self._drawStates()
+        self._drawMessage(message ?? self.header)
         self.terminal.newLine()
     }
 

Sources/Basics/ProgressAnimation/Concrete/NinjaMultiLineProgressAnimation.swift

@@ -63,5 +63,10 @@ extension NinjaMultiLineProgressAnimation: ProgressAnimationProtocol {
         self.terminal.flush()
     }
 
-    func complete() {}
+    func complete(_ message: String?) {
+        if let message {
+            self.terminal.write(message)
+            self.terminal.flush()
+        }
+    }
 }

Sources/Basics/ProgressAnimation/Concrete/NinjaRedrawingProgressAnimation.swift

@@ -63,8 +63,8 @@ extension NinjaRedrawingProgressAnimation: ProgressAnimationProtocol {
         self._flush()
     }
 
-    func complete() {
-        self._complete()
+    func complete(_ message: String?) {
+        self._complete(message)
         self._flush()
     }
 }
@@ -85,7 +85,8 @@ extension NinjaRedrawingProgressAnimation {
         self.hasDisplayedProgress = true
     }
 
-    func _complete() {
+    func _complete(_ message: String?) {
+        #warning("TODO")
         if self.hasDisplayedProgress {
             self.terminal.newLine()
         }

Sources/Basics/ProgressAnimation/Concrete/PercentMultiLineProgressAnimation.swift

@@ -72,5 +72,10 @@ extension PercentMultiLineProgressAnimation: ProgressAnimationProtocol {
         self.terminal.flush()
     }
 
-    func complete() {}
+    func complete(_ message: String?) {
+        if let message {
+            self.terminal.write(message)
+            self.terminal.flush()
+        }
+    }
 }

Sources/Basics/ProgressAnimation/Concrete/PercentRedrawingProgressAnimation.swift

@@ -72,8 +72,8 @@ extension PercentRedrawingProgressAnimation: ProgressAnimationProtocol {
         self._flush()
     }
 
-    func complete() {
-        self._complete()
+    func complete(_ message: String?) {
+        self._complete(message)
         self._flush()
     }
 }
@@ -134,12 +134,15 @@ extension PercentRedrawingProgressAnimation {
         self.hasDisplayedProgress = true
     }
 
-    func _complete() {
+    func _complete(_ message: String?) {
         self._clear()
         guard self.hasDisplayedHeader else { return }
         self.terminal.carriageReturn()
         self.terminal.moveCursorUp(cells: 1)
         self.terminal.eraseLine(.entire)
+        if let message {
+            self.terminal.write(message)
+        }
     }
 
     func _clear() {

Sources/Basics/ProgressAnimation/Concrete/PercentSingleLineProgressAnimation.swift

@@ -76,5 +76,10 @@ extension PercentSingleLineProgressAnimation: ProgressAnimationProtocol {
         self.terminal.flush()
     }
 
-    func complete() {}
+    func complete(_ message: String?) {
+        if let message {
+            self.terminal.write(message)
+            self.terminal.flush()
+        }
+    }
 }

Sources/Basics/ProgressAnimation/Misc/ProgressAdapter.swift

@@ -43,14 +43,6 @@ package enum ProgressAnimation {
         } else {
             NinjaMultiLineProgressAnimation.self
         }
-
-//        if !interactive {
-//            PercentSingleLineProgressAnimation.self
-//        } else if !verbose {
-//            NinjaRedrawingProgressAnimation.self
-//        } else {
-//            NinjaMultiLineProgressAnimation.self
-//        }
     }
 
     package static func make(

Sources/Basics/ProgressAnimation/Misc/ProgressAnimation.swift

@@ -31,7 +31,7 @@ package protocol ProgressAnimationProtocol {
     func interleave(_ bytes: some Collection<UInt8>)
 
     /// Complete the animation.
-    func complete()
+    func complete(_ message: String?)
 }
 
 extension ProgressAnimationProtocol {

Sources/Basics/ProgressAnimation/Misc/ProgressAnimationProtocol.swift

@@ -444,11 +444,7 @@ final class LLBuildProgressTracker: LLBuildBuildSystemDelegate, SwiftCompilerOut
     func buildStart(
         configuration: BuildConfiguration,
         action: String
-    ) {
-        self.queue.sync {
-            self.progressAnimation.interleave("\(action) for \(configuration == .debug ? "debugging" : "production")...\n")
-        }
-    }
+    ) { }
 
     func buildComplete(
         success: Bool,
@@ -463,11 +459,9 @@ final class LLBuildProgressTracker: LLBuildBuildSystemDelegate, SwiftCompilerOut
         }
 
         self.queue.sync {
-            self.progressAnimation.complete()
-            if success {
-                let result = self.cancelled ? "cancelled" : "complete"
-                self.progressAnimation.interleave("\(action) \(subsetString)\(result)! (\(duration.descriptionInSeconds))\n")
-            }
+            let result = !success ? "failed" :
+                self.cancelled ? "cancelled" : "complete" 
+            self.progressAnimation.complete("\(action) \(subsetString)\(result)!")
         }
     }
 }