Fix colon followed by right paren spacing

Author: kimdv

CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

@@ -95,7 +95,7 @@ public let EXPR_NODES: [Node] = [
          Child(name: "Name",
                kind: .node(kind: "Token")),
          Child(name: "Colon",
-               kind: .token(choices: [.token(tokenKind: "ColonToken")]))
+               kind: .token(choices: [.token(tokenKind: "ColonToken")], requiresTrailingSpace: false))
        ]),
 
   Node(name: "DeclNameArgumentList",

CodeGeneration/Sources/generate-swiftsyntax/templates/basicformat/BasicFormatFile.swift

@@ -246,15 +246,15 @@ let basicFormatFile = SourceFileSyntax {
       StmtSyntax(
         """
         switch (token.tokenKind, token.nextToken(viewMode: .sourceAccurate)?.tokenKind) {
-        case (.keyword(.as), .exclamationMark), // Ensures there is not space in `as!`
-             (.keyword(.as), .postfixQuestionMark), // Ensures there is not space in `as?`
-             (.exclamationMark, .leftParen), // Ensures there is not space in `myOptionalClosure!()`
+        case (.exclamationMark, .leftParen), // Ensures there is not space in `myOptionalClosure!()`
              (.exclamationMark, .period), // Ensures there is not space in `myOptionalBar!.foo()`
+             (.keyword(.as), .exclamationMark), // Ensures there is not space in `as!`
+             (.keyword(.as), .postfixQuestionMark), // Ensures there is not space in `as?`
+             (.keyword(.try), .exclamationMark), // Ensures there is not space in `try!`
+             (.keyword(.try), .postfixQuestionMark), // Ensures there is not space in `try?`:
              (.postfixQuestionMark, .leftParen), // Ensures there is not space in `init?()` or `myOptionalClosure?()`s
              (.postfixQuestionMark, .rightAngle), // Ensures there is not space in `ContiguousArray<RawSyntax?>`
-             (.postfixQuestionMark, .rightParen), // Ensures there is not space in `myOptionalClosure?()`
-             (.keyword(.try), .exclamationMark), // Ensures there is not space in `try!`
-             (.keyword(.try), .postfixQuestionMark): // Ensures there is not space in `try?`:
+             (.postfixQuestionMark, .rightParen): // Ensures there is not space in `myOptionalClosure?()`
           return false
         default:
           break

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -178,6 +178,8 @@ open class BasicFormat: SyntaxRewriter {
     switch keyPath {
     case \AvailabilityArgumentSyntax.entry: 
       return false
+    case \DeclNameArgumentSyntax.colon: 
+      return false
     case \DictionaryExprSyntax.content: 
       return false
     case \DynamicReplacementArgumentsSyntax.forLabel: 
@@ -194,15 +196,15 @@ open class BasicFormat: SyntaxRewriter {
       return requiresTrailingSpace
     }
     switch (token.tokenKind, token.nextToken(viewMode: .sourceAccurate)?.tokenKind) {
-    case (.keyword(.as), .exclamationMark), // Ensures there is not space in `as!`
-     (.keyword(.as), .postfixQuestionMark), // Ensures there is not space in `as?`
-     (.exclamationMark, .leftParen), // Ensures there is not space in `myOptionalClosure!()`
+    case (.exclamationMark, .leftParen), // Ensures there is not space in `myOptionalClosure!()`
      (.exclamationMark, .period), // Ensures there is not space in `myOptionalBar!.foo()`
+     (.keyword(.as), .exclamationMark), // Ensures there is not space in `as!`
+     (.keyword(.as), .postfixQuestionMark), // Ensures there is not space in `as?`
+     (.keyword(.try), .exclamationMark), // Ensures there is not space in `try!`
+     (.keyword(.try), .postfixQuestionMark), // Ensures there is not space in `try?`:
      (.postfixQuestionMark, .leftParen), // Ensures there is not space in `init?()` or `myOptionalClosure?()`s
      (.postfixQuestionMark, .rightAngle), // Ensures there is not space in `ContiguousArray<RawSyntax?>`
-     (.postfixQuestionMark, .rightParen), // Ensures there is not space in `myOptionalClosure?()`
-     (.keyword(.try), .exclamationMark), // Ensures there is not space in `try!`
-     (.keyword(.try), .postfixQuestionMark): // Ensures there is not space in `try?`:
+     (.postfixQuestionMark, .rightParen): // Ensures there is not space in `myOptionalClosure?()`
       return false
     default: 
       break 

Tests/SwiftSyntaxBuilderTest/VariableTests.swift

@@ -89,6 +89,22 @@ final class VariableTests: XCTestCase {
         let bar = try! !functionThatThrows()
         """
       ),
+      #line: (
+        DeclSyntax("var bar: Foo { bar.map(Foo.init(raw:)) }"),
+        """
+        var bar: Foo {
+            bar.map(Foo.init(raw:))
+        }
+        """
+      ),
+      #line: (
+        DeclSyntax("var bar: Foo { bar.map(Foo.init(raw:otherParam:)) }"),
+        """
+        var bar: Foo {
+            bar.map(Foo.init(raw:otherParam:))
+        }
+        """
+      ),
     ]
 
     for (line, testCase) in testCases {

gyb_syntax_support/ExprNodes.py

@@ -71,7 +71,7 @@
     Node('DeclNameArgument', name_for_diagnostics=None, kind='Syntax',
          children=[
              Child('Name', kind='Token'),
-             Child('Colon', kind='ColonToken'),
+             Child('Colon', kind='ColonToken', requires_trailing_space=False),
          ]),
     Node('DeclNameArgumentList', name_for_diagnostics=None, kind='SyntaxCollection',
          element='DeclNameArgument'),