Fix spacing around angles

Author: kimdv

CodeGeneration/Sources/generate-swiftbasicformat/BasicFormatFile.swift

@@ -122,6 +122,17 @@ let basicFormatFile = SourceFile {
     }
 
     FunctionDecl("open func requiresLeadingSpace(_ token: TokenSyntax) -> Bool") {
+      SwitchStmt("""
+        switch (token.tokenKind, token.previousToken(viewMode: .sourceAccurate)?.tokenKind) {
+        case (.leftAngle, .identifier(_)),
+             (.rightAngle, .identifier(_)),
+             (.rightAngle, .postfixQuestionMark):
+          return false
+        default:
+          break
+        }
+        """)
+      
       SwitchStmt(expression: Expr("token.tokenKind")) {
         for token in SYNTAX_TOKENS {
           if token.requiresLeadingSpace {
@@ -143,6 +154,8 @@ let basicFormatFile = SourceFile {
              (.asKeyword, .postfixQuestionMark),
              (.initKeyword, .leftParen),
              (.initKeyword, .postfixQuestionMark),
+             (.leftAngle, .identifier(_)),
+             (.rightAngle, .postfixQuestionMark),
              (.tryKeyword, .exclamationMark),
              (.tryKeyword, .postfixQuestionMark):
           return false

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -124,6 +124,14 @@ open class BasicFormat: SyntaxRewriter {
   }
 
   open func requiresLeadingSpace(_ token: TokenSyntax) -> Bool {
+    switch (token.tokenKind, token.previousToken(viewMode: .sourceAccurate)?.tokenKind) {
+    case (.leftAngle, .identifier(_ )), 
+     (.rightAngle, .identifier(_ )), 
+     (.rightAngle, .postfixQuestionMark): 
+      return false
+    default: 
+      break 
+    }
     switch token.tokenKind {
     case .whereKeyword: 
       return true
@@ -152,6 +160,8 @@ open class BasicFormat: SyntaxRewriter {
      (.asKeyword, .postfixQuestionMark), 
      (.initKeyword, .leftParen), 
      (.initKeyword, .postfixQuestionMark), 
+     (.leftAngle, .identifier(_ )), 
+     (.rightAngle, .postfixQuestionMark), 
      (.tryKeyword, .exclamationMark), 
      (.tryKeyword, .postfixQuestionMark): 
       return false

Tests/SwiftSyntaxBuilderTest/StructTests.swift

@@ -69,7 +69,7 @@ final class StructTests: XCTestCase {
       public struct TestStruct {
           /// A nested struct
           /// with multi line comment
-          struct NestedStruct < A, B: C, D > where A: X, A.P == D {
+          struct NestedStruct<A, B: C, D> where A: X, A.P == D {
           }
           /// A nested struct\r\
           /// with multi line comment where the newline is a CR\r\

Tests/SwiftSyntaxBuilderTest/VariableTests.swift

@@ -25,7 +25,7 @@ final class VariableTests: XCTestCase {
     AssertBuildResult(buildable, "␣let a: [Int]")
   }
 
-  func testVariableDeclWithTry() {
+  func testVariableDeclWithStringParsing() {
     let testCases: [UInt: (VariableDecl, String)] = [
       #line: (
         VariableDecl("let content = try? String(contentsOf: url)"),
@@ -35,6 +35,10 @@ final class VariableTests: XCTestCase {
         VariableDecl("let content = try! String(contentsOf: url)"),
         "let content = try! String(contentsOf: url)"
       ),
+      #line: (
+        VariableDecl("var newLayout: ContiguousArray<RawSyntax?>?"),
+        "var newLayout: ContiguousArray<RawSyntax?>?"
+      ),
     ]
 
     for (line, testCase) in testCases {