Merge pull request #508 from Azoy/fix-concat-printing

[Printer] Unconditionally print a regex block for concatenations

Author: Azoy

Sources/_StringProcessing/PrintAsPattern.swift

@@ -71,8 +71,15 @@ extension PrettyPrinter {
       print("let \(namedCapture) = Reference(Substring.self)")
     }
 
-    printBlock("Regex") { printer in
-      printer.printAsPattern(convertedFromAST: node)
+    switch node {
+    case .concatenation(_):
+      printAsPattern(convertedFromAST: node)
+    case .convertedRegexLiteral(.concatenation(_), _):
+      printAsPattern(convertedFromAST: node)
+    default:
+      printBlock("Regex") { printer in
+        printer.printAsPattern(convertedFromAST: node)
+      }
     }
   }
 
@@ -99,8 +106,10 @@ extension PrettyPrinter {
       }
 
     case let .concatenation(c):
-      c.forEach {
-        printAsPattern(convertedFromAST: $0)
+      printBlock("Regex") { printer in
+        c.forEach {
+          printer.printAsPattern(convertedFromAST: $0)
+        }
       }
 
     case let .nonCapturingGroup(kind, child):

Tests/RegexTests/RenderDSLTests.swift

@@ -97,19 +97,17 @@ extension RenderDSLTests {
       }
       """)
 
-    try XCTExpectFailure("Concatenations in alternations aren't grouped") {
-      try testConversion(#"\da|b"#, """
-        Regex {
-          ChoiceOf {
-            Regex {
-              .digit
-              "a"
-            }
-            "bc"
+    try testConversion(#"\da|bc"#, """
+      Regex {
+        ChoiceOf {
+          Regex {
+            One(.digit)
+            "a"
           }
+          "bc"
         }
-        """)
-    }
+      }
+      """)
   }
 
   func testQuoting() throws {