Merge pull request #691 from fwcd/fwcd/var-decl-attr-trailing-trivia

Add trailing space to attributes in `VariableDecl`
swiftlang · Sep 2, 2022 · cb71972 · cb71972
2 parents ce5be96 + ef4af42
commit cb71972
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/Sources/SwiftSyntaxBuilder/ConvenienceInitializers/VariableDeclConvenienceInitializers.swift b/Sources/SwiftSyntaxBuilder/ConvenienceInitializers/VariableDeclConvenienceInitializers.swift
@@ -25,9 +25,9 @@ extension VariableDecl {
   ) {
     self.init(
       leadingTrivia: leadingTrivia,
-      attributes: attributes,
+      attributes: attributes?.createAttributeList().withTrailingTrivia(.space),
       modifiers: modifiers,
-      letOrVarKeyword: attributes != nil ? letOrVarKeyword.withLeadingTrivia(.space) : letOrVarKeyword
+      letOrVarKeyword: letOrVarKeyword
     ) {
       PatternBinding(
         pattern: name,
@@ -48,9 +48,9 @@ extension VariableDecl {
   ) {
     self.init(
       leadingTrivia: leadingTrivia,
-      attributes: attributes,
+      attributes: attributes?.createAttributeList().withTrailingTrivia(.space),
       modifiers: modifiers,
-      letOrVarKeyword: .var.withLeadingTrivia(attributes != nil ? .space : .zero)
+      letOrVarKeyword: .var
     ) {
       PatternBinding(
         pattern: name,

diff --git a/Tests/SwiftSyntaxBuilderTest/VariableTests.swift b/Tests/SwiftSyntaxBuilderTest/VariableTests.swift
@@ -150,6 +150,20 @@ final class VariableTests: XCTestCase {
         }
         """
       ),
+      #line: (
+        VariableDecl(
+          attributes: CustomAttribute("WithArgs") {
+            TupleExprElement(expression: "value")
+          },
+          modifiers: [Token.public],
+          .let,
+          name: "z",
+          type: "Float"
+        ),
+        """
+        @WithArgs(value) public let z: Float
+        """
+      ),
     ]
 
     for (line, testCase) in testCases {