Improve the formatting of the completion error message

tuist · Apr 17, 2024 · 2fe93a0 · 2fe93a0
1 parent 04824e6
commit 2fe93a0
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 30 deletions.
diff --git a/Sources/SwiftTerminal/Components/CompletionMessage.swift b/Sources/SwiftTerminal/Components/CompletionMessage.swift
@@ -12,22 +12,22 @@ public enum CompletionMessage {
         case let .error(errorMessage, context, nextSteps):
             var content = """
             \("✘ An error ocurred".hexColorIfEnabled(theme.danger, environment: environment).bold)
-            \(errorMessage.split(separator: "\n").map { "  \($0)" }.joined(separator: "\n"))
+            \(errorMessage.split(separator: "\n").map { "  \($0)".dimIfColorEnabled(environment: environment) }.joined(separator: "\n"))
             """
             if let context {
                 content = """
                 \(content)
 
                 \("  \("Context".underline)".hexColorIfEnabled(theme.danger, environment: environment))
-                \(context.split(separator: "\n").map { "    \($0)" }.joined(separator: "\n"))
+                \(context.split(separator: "\n").map { "    \($0)".dimIfColorEnabled(environment: environment) }.joined(separator: "\n"))
                 """
             }
             if !nextSteps.isEmpty {
                 content = """
                 \(content)
 
                 \("  \("Next steps".underline)".hexColorIfEnabled(theme.danger, environment: environment))
-                \(nextSteps.map { "    ▪︎ \($0)" }.joined(separator: "\n"))
+                \(nextSteps.map { "    ▪︎ \($0)".dimIfColorEnabled(environment: environment) }.joined(separator: "\n"))
                 """
             }
             await standardPipelines.error.write(content: "\(content)\n")

diff --git a/Sources/SwiftTerminal/Utilities/Rainbow+Extras.swift b/Sources/SwiftTerminal/Utilities/Rainbow+Extras.swift
@@ -10,6 +10,14 @@ extension String {
             return self
         }
     }
+
+    func dimIfColorEnabled(environment: Environment = .default) -> String {
+        if environment.shouldColor {
+            return dim
+        } else {
+            return self
+        }
+    }
 
     func hexColorIfEnabled(_ hex: String, environment: Environment = .default) -> String {
         if environment.shouldColor {

diff --git a/Sources/SwiftTerminal/Utilities/Renderer.swift b/Sources/SwiftTerminal/Utilities/Renderer.swift
@@ -7,7 +7,7 @@ public actor Renderer {
 
     private func eraseLines(_ lines: Int, standardPipeline: StandardPipelining) async {
         if lines == 0 { return }
-        for index in 0 ... lines {
+        for index in 0...lines {
             await eraseLine(standardPipeline: standardPipeline)
             if index < lastRenderedContent.count {
                 await moveCursorUp(standardPipeline: standardPipeline)

diff --git a/Sources/SwiftTerminal/Utilities/StandardPipelines.swift b/Sources/SwiftTerminal/Utilities/StandardPipelines.swift
@@ -14,16 +14,7 @@ public actor StandardOutputPipeline: StandardPipelining {
     public init() {}
 
     public func write(content: String) {
-        #if os(Linux)
-            print(content)
-        #endif
-
-        #if os(macOS)
-            if let data = content.data(using: .utf8) {
-                // swiftlint:disable:next force_try
-                try! FileHandle.standardOutput.write(contentsOf: data)
-            }
-        #endif
+        print(content, terminator: "")
     }
 }
 

diff --git a/Sources/swift-terminal/swift-terminal.swift b/Sources/swift-terminal/swift-terminal.swift
@@ -35,35 +35,35 @@ enum CLI {
 //        await CompletionMessage.render(message: .warnings(["Your hosted version of Tuist Cloud is outdated", "We detected
 //        invalid binaries in the cache"]), theme: tuistTheme, standardPipelines: standardPipelines)
 //
-        await standardPipelines.output.write(content: "\n\n----- CollapsibleStream -----\n".bold)
-        try await CollapsibleStream.render(
-            title: "xcodebuild -scheme 1 -workspace Tuist.xcworkspace",
-            stream: makeStream(),
-            theme: tuistTheme
-        )
+//        await standardPipelines.output.write(content: "\n\n----- CollapsibleStream -----\n".bold)
+//        try await CollapsibleStream.render(
+//            title: "xcodebuild -scheme 1 -workspace Tuist.xcworkspace",
+//            stream: makeStream(),
+//            theme: tuistTheme
+//        )
 //        try await CollapsibleStream.render(title: "xcodebuild -scheme 2 -workspace Tuist.xcworkspace", stream: makeStream(),
 //        theme: tuistTheme)
 //        try await CollapsibleStream.render(title: "xcodebuild -scheme 3 -workspace Tuist.xcworkspace", stream: makeStream(),
 //        theme: tuistTheme)
 //        try await CollapsibleStream.render(title: "xcodebuild -scheme 4 -workspace Tuist.xcworkspace", stream: makeStream(),
 //        theme: tuistTheme)
-//        try await TerminalConcurrentAsyncStreams.render(title: "Uploading frameworks to Tuist Cloud", completionMessage:
-//        "Completed uploading", theme: tuistTheme, asyncStreams: [
-//            "FrameworkA": makeProgressStream(),
-//            "FrameworkB": makeProgressStream(),
-//            "FrameworkC": makeProgressStream(),
-//            "FrameworkD": makeProgressStream(),
-//            "FrameworkE": makeProgressStream(),
-//            "FrameworkF": makeProgressStream()
-//        ])
+        try await TerminalConcurrentAsyncStreams.render(title: "Uploading frameworks to Tuist Cloud", completionMessage:
+        "Completed uploading", theme: tuistTheme, asyncStreams: [
+            "FrameworkA": makeProgressStream(),
+            "FrameworkB": makeProgressStream(),
+            "FrameworkC": makeProgressStream(),
+            "FrameworkD": makeProgressStream(),
+            "FrameworkE": makeProgressStream(),
+            "FrameworkF": makeProgressStream()
+        ])
 //
 //        print("\n\n")
 //
 
 //
 //        print("\n\n")
 
-//
+
 //        try await TerminalCollapsibleTitledStream.renderSectioned(section: "Building XCFrameworks", renderables: [
 //            (title: "xcodebuild -scheme 1 -workspace Tuist.xcworkspace", stream: makeStream()),
 //            (title: "xcodebuild -scheme 2 -workspace Tuist.xcworkspace", stream: makeStream()),