Merge pull request #1315 from kimdv/kimdv/fix-spacing

Author: kimdv

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -110,7 +110,7 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("cType"),
   KeywordSpec("default", isLexerClassified: true),
   KeywordSpec("defer", isLexerClassified: true, requiresTrailingSpace: true),
-  KeywordSpec("deinit", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("deinit", isLexerClassified: true),
   KeywordSpec("deprecated"),
   KeywordSpec("derivative"),
   KeywordSpec("didSet"),

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -249,8 +249,6 @@ open class BasicFormat: SyntaxRewriter {
       return true
     case .keyword(.`defer`): 
       return true
-    case .keyword(.`deinit`): 
-      return true
     case .keyword(.`else`): 
       return true
     case .keyword(.`enum`): 

Tests/SwiftSyntaxBuilderTest/CollectionNodeFlatteningTests.swift

@@ -15,7 +15,6 @@ import SwiftSyntax
 import SwiftSyntaxBuilder
 
 final class CollectionNodeFlatteningTests: XCTestCase {
-
   func test_FlattenCodeBlockItemListWithBuilder() {
     let leadingTrivia = Trivia.unexpectedText("␣")
 

Tests/SwiftSyntaxBuilderTest/ReturnStmsTests.swift

@@ -15,20 +15,12 @@ import SwiftSyntax
 import SwiftSyntaxBuilder
 
 final class ReturnStmtTests: XCTestCase {
-
   func testReturnStmt() {
-    let buildable = StmtSyntax("return Self.parse(from: &parser)")
-
-    AssertBuildResult(
-      buildable,
-      """
-      return Self.parse(from: &parser)
-      """
-    )
-  }
-
-  func testReturnStmtwithAsKeyword() {
     let testCases: [UInt: (StmtSyntax, String)] = [
+      #line: (
+        StmtSyntax("return Self.parse(from: &parser)"),
+        "return Self.parse(from: &parser)"
+      ),
       #line: (
         StmtSyntax("return self.asProtocol(SyntaxProtocol.self) as? DeclSyntaxProtocol"),
         "return self.asProtocol(SyntaxProtocol.self) as? DeclSyntaxProtocol"
@@ -45,6 +37,10 @@ final class ReturnStmtTests: XCTestCase {
         StmtSyntax("return !myBool"),
         "return !myBool"
       ),
+      #line: (
+        StmtSyntax("return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)"),
+        "return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)"
+      ),
     ]
 
     for (line, testCase) in testCases {