Make ConsoleText ExpressibleByStringInterpolation (#131)

* conform ConsoleText to ExpressibleByStringInterpolation * Fixed 'swift build' calls in GH Workflow * fix swift build test Co-authored-by: Caleb Kleveter <caleb.kleveter@gmail.com>
vapor · Jan 23, 2020 · 5458574 · 5458574
1 parent c525884
commit 5458574
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,15 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - run: |
-      swift build
-      swift test --enable-test-discovery --sanitize=thread
+    - run: swift test --enable-test-discovery --sanitize=thread
   bionic:
     container: 
       image: swift:5.1-bionic
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - run: |
-      swift build
-      swift test --enable-test-discovery --sanitize=thread
+    - run: swift test --enable-test-discovery --sanitize=thread
diff --git a/Sources/ConsoleKit/Command/CommandGroup.swift b/Sources/ConsoleKit/Command/CommandGroup.swift
@@ -51,8 +51,8 @@ extension CommandGroup {
     }
 
     private func outputGroupHelp(using context: inout CommandContext) {
-        context.console.output("Usage: ".consoleText(.info) + context.input.executable.consoleText() + " ", newLine: false)
-        context.console.output("<command> ".consoleText(.warning), newLine: false)
+        context.console.output("\("Usage: ", style: .info) \(context.input.executable)", newLine: false)
+        context.console.output("\("<command>", style: .warning) ", newLine: false)
         context.console.print()
 
         if !self.help.isEmpty {

diff --git a/Sources/ConsoleKit/Output/ConsoleText.swift b/Sources/ConsoleKit/Output/ConsoleText.swift
@@ -96,3 +96,29 @@ public func +(lhs: ConsoleText, rhs: ConsoleText) -> ConsoleText {
 public func +=(lhs: inout ConsoleText, rhs: ConsoleText) {
     lhs = lhs + rhs
 }
+
+extension ConsoleText: ExpressibleByStringInterpolation {
+    public init(stringInterpolation: StringInterpolation) {
+        self.fragments = stringInterpolation.fragments
+    }
+
+    public struct StringInterpolation: StringInterpolationProtocol {
+        public var fragments: [ConsoleTextFragment]
+
+        public init(literalCapacity: Int, interpolationCount: Int) {
+            self.fragments = []
+            self.fragments.reserveCapacity(literalCapacity)
+        }
+
+        public mutating func appendLiteral(_ literal: String) {
+            self.fragments.append(.init(string: literal))
+        }
+
+        public mutating func appendInterpolation(
+            _ value: String,
+            style: ConsoleStyle = .plain
+        ) {
+            self.fragments.append(.init(string: value, style: style))
+        }
+    }
+}