Fix spacings around !and ?

Author: kimdv

CodeGeneration/Sources/SyntaxSupport/gyb_generated/TokenSpec.swift

@@ -278,8 +278,8 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
   PunctuatorSpec(name: "Arrow", kind: "arrow", text: "->", requiresLeadingSpace: true, requiresTrailingSpace: true),
   PunctuatorSpec(name: "Backtick", kind: "backtick", text: "`"),
   PunctuatorSpec(name: "Backslash", kind: "backslash", text: "\\"),
-  PunctuatorSpec(name: "ExclamationMark", kind: "exclaim_postfix", text: "!", requiresTrailingSpace: true),
-  PunctuatorSpec(name: "PostfixQuestionMark", kind: "question_postfix", text: "?", requiresTrailingSpace: true),
+  PunctuatorSpec(name: "ExclamationMark", kind: "exclaim_postfix", text: "!"),
+  PunctuatorSpec(name: "PostfixQuestionMark", kind: "question_postfix", text: "?"),
   PunctuatorSpec(name: "InfixQuestionMark", kind: "question_infix", text: "?"),
   PunctuatorSpec(name: "StringQuote", kind: "string_quote", text: "\"", classification: "StringLiteral"),
   PunctuatorSpec(name: "SingleQuote", kind: "single_quote", text: "\'", classification: "StringLiteral"),

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

@@ -157,17 +157,15 @@ 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, .leftParen), // Ensures there is not space in `myOptionalClosure!()`
-             (.exclamationMark, .period), // Ensures there is not space in `myOptionalBar!.foo()`
              (.initKeyword, .leftParen), // Ensures there is not space in `init()`
              (.initKeyword, .postfixQuestionMark), // Ensures there is not space in `init?`
-             (.postfixQuestionMark, .leftParen), // Ensures there is not space in `init?()`
-             (.postfixQuestionMark, .rightAngle), // Ensures there is not space in `ContiguousArray<RawSyntax?>`
-             (.postfixQuestionMark, .rightParen), // Ensures there is not space in `myOptionalClosure?()`
              (.tryKeyword, .exclamationMark), // Ensures there is not space in `try!`
              (.tryKeyword, .postfixQuestionMark), // Ensures there is not space in `try?`
              (.binaryOperator, .comma): // Ensures there is no space in @available(*, deprecated)
           return false
+        case (.exclamationMark, .identifier), // Ensures there is not space in `try! foo`
+             (.postfixQuestionMark, .identifier): // Ensures there is not space in `try? foo`
+          return true
         default:
           break
         }

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -170,17 +170,15 @@ 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, .leftParen), // Ensures there is not space in `myOptionalClosure!()`
-     (.exclamationMark, .period), // Ensures there is not space in `myOptionalBar!.foo()`
      (.initKeyword, .leftParen), // Ensures there is not space in `init()`
      (.initKeyword, .postfixQuestionMark), // Ensures there is not space in `init?`
-     (.postfixQuestionMark, .leftParen), // Ensures there is not space in `init?()`
-     (.postfixQuestionMark, .rightAngle), // Ensures there is not space in `ContiguousArray<RawSyntax?>`
-     (.postfixQuestionMark, .rightParen), // Ensures there is not space in `myOptionalClosure?()`
      (.tryKeyword, .exclamationMark), // Ensures there is not space in `try!`
      (.tryKeyword, .postfixQuestionMark), // Ensures there is not space in `try?`
      (.binaryOperator, .comma): // Ensures there is no space in @available(*, deprecated)
       return false
+    case (.exclamationMark, .identifier), // Ensures there is not space in `try! foo`
+     (.postfixQuestionMark, .identifier): // Ensures there is not space in `try? foo`
+      return true
     default: 
       break 
     }
@@ -283,10 +281,6 @@ open class BasicFormat: SyntaxRewriter {
       return true
     case .arrow: 
       return true
-    case .exclamationMark: 
-      return true
-    case .postfixQuestionMark: 
-      return true
     case .poundKeyPathKeyword: 
       return true
     case .poundLineKeyword: 

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

@@ -9166,7 +9166,7 @@ public enum SyntaxFactory {
   @available(*, deprecated, message: "Use TokenSyntax.exclamationMarkToken instead")
   public static func makeExclamationMarkToken(
     leadingTrivia: Trivia = [],
-    trailingTrivia: Trivia = .space
+    trailingTrivia: Trivia = []
   ) -> TokenSyntax {
     return makeToken(.exclamationMark, presence: .present,
                      leadingTrivia: leadingTrivia,
@@ -9175,7 +9175,7 @@ public enum SyntaxFactory {
   @available(*, deprecated, message: "Use TokenSyntax.postfixQuestionMarkToken instead")
   public static func makePostfixQuestionMarkToken(
     leadingTrivia: Trivia = [],
-    trailingTrivia: Trivia = .space
+    trailingTrivia: Trivia = []
   ) -> TokenSyntax {
     return makeToken(.postfixQuestionMark, presence: .present,
                      leadingTrivia: leadingTrivia,

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,36 @@ 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!)
+        }
+        """
+      ),
+      #line: (
+        VariableDecl(#"var foo: String { bar ?? "" }"#),
+        #"""
+        var foo: String {
+            bar ?? ""
+        }
+        """#
+      ),
     ]
 
     for (line, testCase) in testCases {

gyb_syntax_support/Token.py

@@ -276,11 +276,9 @@ def macro_name(self):
 
     Punctuator('Backslash', 'backslash', text='\\\\'),
 
-    Punctuator('ExclamationMark', 'exclaim_postfix', text='!',
-               requires_trailing_space=True),
+    Punctuator('ExclamationMark', 'exclaim_postfix', text='!'),
 
-    Punctuator('PostfixQuestionMark', 'question_postfix', text='?',
-               requires_trailing_space=True),
+    Punctuator('PostfixQuestionMark', 'question_postfix', text='?'),
     Punctuator('InfixQuestionMark', 'question_infix', text='?'),
 
     Punctuator('StringQuote', 'string_quote', text='\\\"',