Fix spacings around !and ?

Author: kimdv

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

@@ -157,13 +157,18 @@ let basicFormatFile = SourceFile {
         switch (token.tokenKind, token.nextToken(viewMode: .sourceAccurate)?.tokenKind) {
         case (.asKeyword, .exclamationMark), // Ensures there is not space in `as!`
              (.asKeyword, .postfixQuestionMark), // Ensures there is not space in `as?`
+             (.exclamationMark, .comma), // Ensures there is not space in `raw: raw!, otherValue: value`
              (.exclamationMark, .leftParen), // Ensures there is not space in `myOptionalClosure!()`
              (.exclamationMark, .period), // Ensures there is not space in `myOptionalBar!.foo()`
+             (.exclamationMark, .rightParen), // Ensures there is not space in `(self!)`
              (.initKeyword, .leftParen), // Ensures there is not space in `init()`
              (.initKeyword, .postfixQuestionMark), // Ensures there is not space in `init?`
+             (.postfixQuestionMark, .comma), // Ensures there is not space in `(raw: String?, otherValue: String)`
              (.postfixQuestionMark, .leftParen), // Ensures there is not space in `init?()`
+             (.postfixQuestionMark, .period), // Ensures there is not space in `someOptional?.foo`
              (.postfixQuestionMark, .rightAngle), // Ensures there is not space in `ContiguousArray<RawSyntax?>`
              (.postfixQuestionMark, .rightParen), // Ensures there is not space in `myOptionalClosure?()`
+             (.postfixQuestionMark, .rightSquareBracket), // Ensures there is not space in `[String?]`
              (.tryKeyword, .exclamationMark), // Ensures there is not space in `try!`
              (.tryKeyword, .postfixQuestionMark): // Ensures there is not space in `try?`
           return false

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -170,13 +170,18 @@ open class BasicFormat: SyntaxRewriter {
     switch (token.tokenKind, token.nextToken(viewMode: .sourceAccurate)?.tokenKind) {
     case (.asKeyword, .exclamationMark), // Ensures there is not space in `as!`
      (.asKeyword, .postfixQuestionMark), // Ensures there is not space in `as?`
+     (.exclamationMark, .comma), // Ensures there is not space in `raw: raw!, otherValue: value`
      (.exclamationMark, .leftParen), // Ensures there is not space in `myOptionalClosure!()`
      (.exclamationMark, .period), // Ensures there is not space in `myOptionalBar!.foo()`
+     (.exclamationMark, .rightParen), // Ensures there is not space in `(self!)`
      (.initKeyword, .leftParen), // Ensures there is not space in `init()`
      (.initKeyword, .postfixQuestionMark), // Ensures there is not space in `init?`
+     (.postfixQuestionMark, .comma), // Ensures there is not space in `(raw: String?, otherValue: String)`
      (.postfixQuestionMark, .leftParen), // Ensures there is not space in `init?()`
+     (.postfixQuestionMark, .period), // Ensures there is not space in `someOptional?.foo`
      (.postfixQuestionMark, .rightAngle), // Ensures there is not space in `ContiguousArray<RawSyntax?>`
      (.postfixQuestionMark, .rightParen), // Ensures there is not space in `myOptionalClosure?()`
+     (.postfixQuestionMark, .rightSquareBracket), // Ensures there is not space in `[String?]`
      (.tryKeyword, .exclamationMark), // Ensures there is not space in `try!`
      (.tryKeyword, .postfixQuestionMark): // Ensures there is not space in `try?`
       return false

Tests/SwiftSyntaxBuilderTest/FunctionTests.swift

@@ -151,6 +151,18 @@ final class FunctionTests: XCTestCase {
         }
         """
       ),
+      #line: (
+        FunctionDecl(
+          """
+          public func foo(myOptionalValue: String?, myOtherOptionalValue: [String?])  {
+          }
+          """
+        ),
+        """
+        public func foo(myOptionalValue: String?, myOtherOptionalValue: [String?])  {
+        }
+        """
+      ),
       #line: (
         FunctionDeclSyntax(
           modifiers: [DeclModifier(name: .public), DeclModifier(name: .static)],

Tests/SwiftSyntaxBuilderTest/VariableTests.swift

@@ -47,6 +47,28 @@ final class VariableTests: XCTestCase {
         }
         """
       ),
+      #line: (
+        VariableDecl("var foo: String? { myOptional?.someProperty }"),
+        """
+        var foo: String? {
+            myOptional?.someProperty
+        }
+        """
+      ),
+      #line: (
+        VariableDecl("let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info)"),
+        """
+        let absoluteRaw = AbsoluteRawSyntax(raw: raw!, info: info)
+        """
+      ),
+      #line: (
+        VariableDecl("var foo: String { bar(baz!) }"),
+        """
+        var foo: String {
+            bar(baz!)
+        }
+        """
+      ),
     ]
 
     for (line, testCase) in testCases {