Merge pull request #503 from rxwei/unary-buildpartialblock

Make unary builder return `Regex` type consistently
swiftlang · Jun 20, 2022 · cc9efb9 · cc9efb9
2 parents fcd0b59 + e6f3896
commit cc9efb9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/Sources/RegexBuilder/Builder.swift b/Sources/RegexBuilder/Builder.swift
@@ -18,8 +18,10 @@ public enum RegexComponentBuilder {
     .init(node: .empty)
   }
 
-  public static func buildPartialBlock<R: RegexComponent>(first: R ) -> R {
-    first
+  public static func buildPartialBlock<R: RegexComponent>(
+    first component: R
+  ) -> Regex<R.RegexOutput> {
+    component.regex
   }
 
   public static func buildExpression<R: RegexComponent>(_ regex: R) -> R {

diff --git a/Tests/RegexBuilderTests/RegexDSLTests.swift b/Tests/RegexBuilderTests/RegexDSLTests.swift
@@ -1015,7 +1015,7 @@ class RegexDSLTests: XCTestCase {
       XCTAssertEqual(str.wholeMatch(of: parser)?.1, version)
     }
   }
-  
+
   func testZeroWidthConsumer() throws {
     struct Trace: CustomConsumingRegexComponent {
       typealias RegexOutput = Void
@@ -1051,6 +1051,26 @@ class RegexDSLTests: XCTestCase {
       
       """)
   }
+
+  func testRegexComponentBuilderResultType() {
+    // Test that the user can declare a closure or computed property marked with
+    // `@RegexComponentBuilder` with `Regex` as the result type.
+    @RegexComponentBuilder
+    var unaryWithSingleNonRegex: Regex<Substring> {
+      OneOrMore("a")
+    }
+    @RegexComponentBuilder
+    var multiComponent: Regex<Substring> {
+      OneOrMore("a")
+      "b"
+    }
+    struct MyCustomRegex: RegexComponent {
+      @RegexComponentBuilder
+      var regex: Regex<Substring> {
+        OneOrMore("a")
+      }
+    }
+  }
 }
 
 extension Unicode.Scalar {