[WIP] Update progress logging

Sources/SwiftBuildSupport/SwiftBuildSystemMessageHandler.swift

@@ -242,17 +242,35 @@ public final class SwiftBuildSystemMessageHandler {
                 }
             }
         case .didUpdateProgress(let progressInfo):
-            let step = Int(progressInfo.percentComplete)
-            let message = if let targetName = progressInfo.targetName {
-                "\(targetName) \(progressInfo.message)"
+            let targetName = progressInfo.targetName
+            let condensedMessage = progressInfo.condensedStatusMessage
+
+            var message = ""
+            if progressInfo.percentComplete < 0 {
+                message = if let targetName {
+                    "\(targetName): \(progressInfo.message)"
+                } else {
+                    progressInfo.message
+                }
             } else {
-                "\(progressInfo.message)"
+                if let targetName {
+                    message += targetName
+                }
+                if let condensedMessage {
+                    message += message.isEmpty ? condensedMessage : ": \(condensedMessage)"
+                }
+
+                // Default to old mechanism if no message has been derived
+                // from the above.
+                if message.isEmpty, progressInfo.message.contains(where: \.isLetter) {
+                    message += progressInfo.message
+                }
             }
 
-            // Skip if message doesn't contain anything useful to display.
-            // TODO: To file an issue for SwiftBuild here.
-            if message.contains(where: \.isLetter) {
-                progressAnimation.update(step: step, total: 100, text: message)
+            if let numerator = progressInfo.numCommands, let denominator = progressInfo.numCommandsExpected {
+                progressAnimation.update(step: numerator, total: denominator, text: message)
+            } else {
+                progressAnimation.update(step: Int(progressInfo.percentComplete), total: 100, text: message)
             }
 
             callback = { [weak self] buildSystem in

Tests/SwiftBuildSupportTests/SwiftBuildSystemMessageHandlerTests.swift

@@ -468,7 +468,8 @@ struct SwiftBuildSystemMessageHandlerTests {
             .progress(message: "Weird percent", percentComplete: -1),
             .progress(message: "12 / 32", percentComplete: 0),
             .progress(message: "Something useful", percentComplete: 12),
-            .progress(message: "Complete", percentComplete: 100)
+            .progress(targetName: "MyFunTarget", numActionsComplete: 123, numActions: 3241, condensedMessage: "Building things..."),
+            .progress(message: "Complete", percentComplete: 100, numActionsComplete: 12354, numActions: 12354, condensedMessage: "Done.")
         ]
 
         for event in events {
@@ -482,8 +483,9 @@ struct SwiftBuildSystemMessageHandlerTests {
         let output = self.outputStream.bytes.description
         #expect(output.contains("Weird percent"))
         #expect(!output.contains("12 / 32"))
+        #expect(output.contains("[123/3241] MyFunTarget: Building things..."))
         #expect(output.contains("Something useful"))
-        #expect(output.contains("Complete"))
+        #expect(output.contains("[12354/12354] Done."))
     }
 }
 
@@ -638,17 +640,23 @@ extension SwiftBuildMessage {
 
     /// SwiftBuildMessage.DidUpdateProgressInfo
     package static func progress(
-        message: String,
-        percentComplete: Double,
+        message: String = "",
+        percentComplete: Double = 0,
         showInLog: Bool = false,
-        targetName: String? = nil
+        targetName: String? = nil,
+        numActionsComplete: Int? = nil,
+        numActions: Int? = nil,
+        condensedMessage: String? = nil
     ) -> SwiftBuildMessage {
         .didUpdateProgress(
             .init(
                 message: message,
                 percentComplete: percentComplete,
                 showInLog: showInLog,
-                targetName: targetName
+                targetName: targetName,
+                numCommands: numActionsComplete,
+                numCommandsExpected: numActions,
+                condensedStatusMessage: condensedMessage
             )
         )
     }