Generate expr node in generateAssertStmtTextChoices

Author: fwcd

Sources/SwiftSyntaxBuilderGeneration/SyntaxBuildableChild.swift

@@ -71,7 +71,7 @@ extension Child {
   /// If this node is a token that can't contain arbitrary text, generate a Swift
   /// `assert` statement that verifies the variable with name var_name and of type
   /// `TokenSyntax` contains one of the supported text options. Otherwise return `nil`.
-  func generateAssertStmtTextChoices(varName: String) -> String? {
+  func generateAssertStmtTextChoices(varName: String) -> ExpressibleAsExprBuildable? {
     guard type.isToken else {
       return nil
     }
@@ -91,14 +91,24 @@ extension Child {
       return nil
     }
 
-    var assertChoices: [String] = []
+    var assertChoices: [ExpressibleAsExprBuildable] = []
     if type.isOptional {
-      assertChoices.append("\(varName) == nil")
+      assertChoices.append(SequenceExpr {
+        varName
+        BinaryOperatorExpr("==")
+        NilLiteralExpr()
+      })
     }
-    let unwrap = type.isOptional ? "!" : ""
     for textChoice in choices {
-      assertChoices.append("\(varName)\(unwrap) == \"\(textChoice)\"")
+      assertChoices.append(SequenceExpr {
+        MemberAccessExpr(base: type.forceUnwrappedIfNeeded(expr: varName), name: "text")
+        BinaryOperatorExpr("==")
+        StringLiteralExpr(raw: textChoice)
+      })
+    }
+    let disjunction = ExprList(assertChoices.flatMap { [$0, BinaryOperatorExpr("||")] }.dropLast())
+    return FunctionCallExpr("assert") {
+      SequenceExpr(elements: disjunction)
     }
-    return "assert(\(assertChoices.joined(separator: " || ")))"
   }
 }

Sources/SwiftSyntaxBuilderGeneration/SyntaxBuildableType.swift

@@ -256,6 +256,15 @@ struct SyntaxBuildableType: Hashable {
     }
   }
 
+  /// Wraps a type in a force unwrap expression depending on whether `isOptional` is true.
+  func forceUnwrappedIfNeeded(expr: ExpressibleAsExprBuildable) -> ExpressibleAsExprBuildable {
+    if isOptional {
+      return ForcedValueExpr(expression: expr)
+    } else {
+      return expr
+    }
+  }
+
   /// Generate an expression that converts a variable named `varName`
   /// which is of `expressibleAs` type to an object of type `buildable`.
   func generateExprConvertParamTypeToStorageType(varName: String) -> ExpressibleAsExprBuildable {