Fix colon followed by right paren spacing

Author: kimdv

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

@@ -246,15 +246,16 @@ 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?`
+        case (.colon, .rightParen), // Ensures there is not space in `.map(Foo.init(raw:))`
              (.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

@@ -194,15 +194,16 @@ 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?`
+    case (.colon, .rightParen), // Ensures there is not space in `.map(Foo.init(raw:))`
      (.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,14 @@ 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:))
+        }
+        """
+      ),
     ]
 
     for (line, testCase) in testCases {