Merge pull request #1264 from kimdv/kimdv/add-node-with-body-to-variable-decl

Author: kimdv

Sources/SwiftSyntaxBuilder/SyntaxNodeWithBody.swift

@@ -123,3 +123,17 @@ public extension SwitchStmtSyntax {
     self.cases = casesBuilder()
   }
 }
+
+// MARK: - VariableDeclSyntax
+// VariableDeclSyntax is a special scenario as it don't have body or members
+// So we cannot conform to `HasTrailingCodeBlock` or `HasTrailingMemberDeclBlock`
+
+public extension VariableDeclSyntax {
+  init(_ signature: PartialSyntaxNodeString, @CodeBlockItemListBuilder accessor: () -> CodeBlockItemListSyntax) {
+    self = "\(signature) {}"
+    assert(self.bindings.count == 1)
+    var binding: PatternBindingSyntax? = self.bindings.last
+    binding?.accessor = .getter(CodeBlockSyntax(statements: accessor()))
+    bindings = PatternBindingListSyntax([binding].compactMap { $0 })
+  }
+}

Tests/SwiftSyntaxBuilderTest/VariableTests.swift

@@ -175,22 +175,37 @@ final class VariableTests: XCTestCase {
   }
 
   func testComputedProperty() {
-    let buildable = VariableDeclSyntax(name: "test", type: TypeAnnotationSyntax(type: TypeSyntax("Int"))) {
-      SequenceExprSyntax {
-        IntegerLiteralExprSyntax(4)
-        BinaryOperatorExprSyntax(text: "+")
-        IntegerLiteralExprSyntax(5)
-      }
-    }
+    let testCases: [UInt: (VariableDeclSyntax, String)] = [
+      #line: (
+        VariableDeclSyntax(name: "test", type: TypeAnnotationSyntax(type: TypeSyntax("Int"))) {
+          SequenceExprSyntax {
+            IntegerLiteralExprSyntax(4)
+            BinaryOperatorExprSyntax(text: "+")
+            IntegerLiteralExprSyntax(5)
+          }
+        },
+        """
+        var test: Int {
+            4 + 5
+        }
+        """
+      ),
+      #line: (
+        VariableDeclSyntax("var foo: String") {
+          ReturnStmtSyntax(#"return "hello world""#)
+        },
+        """
+        var foo: String {
+            return "hello world"
+        }
+        """
+      ),
+    ]
 
-    AssertBuildResult(
-      buildable,
-      """
-      var test: Int {
-          4 + 5
-      }
-      """
-    )
+    for (line, testCase) in testCases {
+      let (builder, expected) = testCase
+      AssertBuildResult(builder, expected, line: line)
+    }
   }
 
   func testAccessorList() {