Remove leading and trailing space from < and >

Author: kimdv

CodeGeneration/Sources/SyntaxSupport/gyb_generated/TokenSpec.swift

@@ -261,8 +261,8 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
   PunctuatorSpec(name: "RightBrace", kind: "r_brace", text: "}"),
   PunctuatorSpec(name: "LeftSquareBracket", kind: "l_square", text: "["),
   PunctuatorSpec(name: "RightSquareBracket", kind: "r_square", text: "]"),
-  PunctuatorSpec(name: "LeftAngle", kind: "l_angle", text: "<", requiresLeadingSpace: true, requiresTrailingSpace: true),
-  PunctuatorSpec(name: "RightAngle", kind: "r_angle", text: ">", requiresLeadingSpace: true, requiresTrailingSpace: true),
+  PunctuatorSpec(name: "LeftAngle", kind: "l_angle", text: "<"),
+  PunctuatorSpec(name: "RightAngle", kind: "r_angle", text: ">"),
   PunctuatorSpec(name: "Period", kind: "period", text: "."),
   PunctuatorSpec(name: "Comma", kind: "comma", text: ",", requiresTrailingSpace: true),
   PunctuatorSpec(name: "Ellipsis", kind: "ellipsis", text: "..."),

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

@@ -124,12 +124,7 @@ let basicFormatFile = SourceFile {
     FunctionDecl("open func requiresLeadingSpace(_ token: TokenSyntax) -> Bool") {
       SwitchStmt("""
         switch (token.previousToken(viewMode: .sourceAccurate)?.tokenKind, token.tokenKind) {
-        case (.identifier, .leftAngle),
-             (.identifier, .rightAngle),
-             (.rightAngle, .exclamationMark),
-             (.rightAngle, .rightBrace),
-             (.rightSquareBracket, .rightAngle),
-             (.postfixQuestionMark, .rightAngle):
+        case (.postfixQuestionMark, .rightAngle):
           return false
         case (.leftParen, .spacedBinaryOperator("*")):
           return false
@@ -161,12 +156,6 @@ let basicFormatFile = SourceFile {
              (.exclamationMark, .period),
              (.initKeyword, .leftParen),
              (.initKeyword, .postfixQuestionMark),
-             (.rightAngle, .exclamationMark),
-             (.leftAngle, .identifier),
-             (.leftAngle, .leftSquareBracket),
-             (.leftAngle, .leftBrace),
-             (.rightAngle, .leftParen),
-             (.rightAngle, .postfixQuestionMark),
              (.postfixQuestionMark, .leftParen),
              (.postfixQuestionMark, .rightAngle),
              (.postfixQuestionMark, .rightParen),

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -125,12 +125,7 @@ open class BasicFormat: SyntaxRewriter {
 
   open func requiresLeadingSpace(_ token: TokenSyntax) -> Bool {
     switch (token.previousToken(viewMode: .sourceAccurate)?.tokenKind, token.tokenKind) {
-    case (.identifier, .leftAngle), 
-     (.identifier, .rightAngle), 
-     (.rightAngle, .exclamationMark), 
-     (.rightAngle, .rightBrace), 
-     (.rightSquareBracket, .rightAngle), 
-     (.postfixQuestionMark, .rightAngle): 
+    case (.postfixQuestionMark, .rightAngle): 
       return false
     case (.leftParen, .spacedBinaryOperator("*")): 
       return false
@@ -146,10 +141,6 @@ open class BasicFormat: SyntaxRewriter {
       return true
     case .leftBrace: 
       return true
-    case .leftAngle: 
-      return true
-    case .rightAngle: 
-      return true
     case .equal: 
       return true
     case .arrow: 
@@ -169,12 +160,6 @@ open class BasicFormat: SyntaxRewriter {
      (.exclamationMark, .period), 
      (.initKeyword, .leftParen), 
      (.initKeyword, .postfixQuestionMark), 
-     (.rightAngle, .exclamationMark), 
-     (.leftAngle, .identifier), 
-     (.leftAngle, .leftSquareBracket), 
-     (.leftAngle, .leftBrace), 
-     (.rightAngle, .leftParen), 
-     (.rightAngle, .postfixQuestionMark), 
      (.postfixQuestionMark, .leftParen), 
      (.postfixQuestionMark, .rightAngle), 
      (.postfixQuestionMark, .rightParen), 
@@ -277,10 +262,6 @@ open class BasicFormat: SyntaxRewriter {
       return true
     case .wildcardKeyword: 
       return true
-    case .leftAngle: 
-      return true
-    case .rightAngle: 
-      return true
     case .comma: 
       return true
     case .colon: 

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

@@ -9307,17 +9307,17 @@ public enum SyntaxFactory {
   }
   @available(*, deprecated, message: "Use TokenSyntax.leftAngleToken instead")
   public static func makeLeftAngleToken(
-    leadingTrivia: Trivia = .space,
-    trailingTrivia: Trivia = .space
+    leadingTrivia: Trivia = [],
+    trailingTrivia: Trivia = []
   ) -> TokenSyntax {
     return makeToken(.leftAngle, presence: .present,
                      leadingTrivia: leadingTrivia,
                      trailingTrivia: trailingTrivia)
   }
   @available(*, deprecated, message: "Use TokenSyntax.rightAngleToken instead")
   public static func makeRightAngleToken(
-    leadingTrivia: Trivia = .space,
-    trailingTrivia: Trivia = .space
+    leadingTrivia: Trivia = [],
+    trailingTrivia: Trivia = []
   ) -> TokenSyntax {
     return makeToken(.rightAngle, presence: .present,
                      leadingTrivia: leadingTrivia,

gyb_syntax_support/Token.py

@@ -254,10 +254,8 @@ def macro_name(self):
     Punctuator('RightBrace', 'r_brace', text='}'),
     Punctuator('LeftSquareBracket', 'l_square', text='['),
     Punctuator('RightSquareBracket', 'r_square', text=']'),
-    Punctuator('LeftAngle', 'l_angle', text='<', requires_leading_space=True,
-               requires_trailing_space=True),
-    Punctuator('RightAngle', 'r_angle', text='>', requires_leading_space=True,
-               requires_trailing_space=True),
+    Punctuator('LeftAngle', 'l_angle', text='<'),
+    Punctuator('RightAngle', 'r_angle', text='>'),
 
     Punctuator('Period', 'period', text='.'),
     Punctuator('Comma', 'comma', text=',', requires_trailing_space=True),