Make TypeBuildable expressible as TypeAnnotation

Author: fwcd

Sources/SwiftSyntaxBuilder/generated/ExpressibleAsProtocols.swift

@@ -85,7 +85,7 @@ public extension ExpressibleAsSyntaxBuildable {
     return SwitchCaseList([self])
   }
 }
-public protocol ExpressibleAsTypeBuildable: ExpressibleAsReturnClause, ExpressibleAsTypeInitializerClause {
+public protocol ExpressibleAsTypeBuildable: ExpressibleAsReturnClause, ExpressibleAsTypeInitializerClause, ExpressibleAsTypeAnnotation {
   func createTypeBuildable() -> TypeBuildable
 }
 public extension ExpressibleAsTypeBuildable {
@@ -97,6 +97,10 @@ public extension ExpressibleAsTypeBuildable {
   func createTypeInitializerClause() -> TypeInitializerClause {
     return TypeInitializerClause(value: self)
   }
+  /// Conformance to ExpressibleAsTypeAnnotation
+  func createTypeAnnotation() -> TypeAnnotation {
+    return TypeAnnotation(type: self)
+  }
 }
 public protocol ExpressibleAsCodeBlockItem: ExpressibleAsCodeBlockItemList {
   func createCodeBlockItem() -> CodeBlockItem
@@ -1737,14 +1741,10 @@ public extension ExpressibleAsPrimaryAssociatedTypeClause {
     return createPrimaryAssociatedTypeClause()
   }
 }
-public protocol ExpressibleAsSimpleTypeIdentifier: ExpressibleAsTypeAnnotation, ExpressibleAsTypeExpr, ExpressibleAsTypeBuildable {
+public protocol ExpressibleAsSimpleTypeIdentifier: ExpressibleAsTypeExpr, ExpressibleAsTypeBuildable {
   func createSimpleTypeIdentifier() -> SimpleTypeIdentifier
 }
 public extension ExpressibleAsSimpleTypeIdentifier {
-  /// Conformance to ExpressibleAsTypeAnnotation
-  func createTypeAnnotation() -> TypeAnnotation {
-    return TypeAnnotation(type: self)
-  }
   /// Conformance to ExpressibleAsTypeExpr
   func createTypeExpr() -> TypeExpr {
     return TypeExpr(type: self)
@@ -1769,26 +1769,18 @@ public extension ExpressibleAsClassRestrictionType {
     return createClassRestrictionType()
   }
 }
-public protocol ExpressibleAsArrayType: ExpressibleAsTypeAnnotation, ExpressibleAsTypeBuildable {
+public protocol ExpressibleAsArrayType: ExpressibleAsTypeBuildable {
   func createArrayType() -> ArrayType
 }
 public extension ExpressibleAsArrayType {
-  /// Conformance to ExpressibleAsTypeAnnotation
-  func createTypeAnnotation() -> TypeAnnotation {
-    return TypeAnnotation(type: self)
-  }
   func createTypeBuildable() -> TypeBuildable {
     return createArrayType()
   }
 }
-public protocol ExpressibleAsDictionaryType: ExpressibleAsTypeAnnotation, ExpressibleAsTypeBuildable {
+public protocol ExpressibleAsDictionaryType: ExpressibleAsTypeBuildable {
   func createDictionaryType() -> DictionaryType
 }
 public extension ExpressibleAsDictionaryType {
-  /// Conformance to ExpressibleAsTypeAnnotation
-  func createTypeAnnotation() -> TypeAnnotation {
-    return TypeAnnotation(type: self)
-  }
   func createTypeBuildable() -> TypeBuildable {
     return createDictionaryType()
   }

Sources/SwiftSyntaxBuilder/gyb_helpers/ExpressibleAsConformances.py

@@ -5,19 +5,13 @@
     'ArrayElementList': [
         'ArrayExpr'
     ],
-    'ArrayType': [
-        'TypeAnnotation'
-    ],
     'CodeBlockItemList': [
         'CodeBlock'
     ],
     'DeclBuildable': [
         'CodeBlockItem',
         'MemberDeclListItem'
     ],
-    'DictionaryType': [
-        'TypeAnnotation'
-    ],
     'ExprBuildable': [
         'CodeBlockItem',
         'InitializerClause'
@@ -39,7 +33,6 @@
         'TupleExprElement'
     ],
     'SimpleTypeIdentifier': [
-        'TypeAnnotation',
         'TypeExpr'
     ],
     'StmtBuildable': [
@@ -52,7 +45,8 @@
     ],
     'TypeBuildable': [
         'ReturnClause',
-        'TypeInitializerClause'
+        'TypeInitializerClause',
+        'TypeAnnotation'
     ]
 }
 

Sources/SwiftSyntaxBuilderGeneration/SyntaxBuildableChild.swift

@@ -47,7 +47,7 @@ extension Child {
               SequenceExpr {
                 MemberAccessExpr(base: varName, name: "leadingTrivia")
                 BinaryOperatorExpr("??")
-                ArrayExpr(elements: [])
+                ArrayExpr {}
               }
             }
           }

Sources/SwiftSyntaxBuilderGeneration/gyb_generated/ExpressibleAsConformances.swift

@@ -19,19 +19,13 @@ let SYNTAX_BUILDABLE_EXPRESSIBLE_AS_CONFORMANCES: [String: [String]] = [
   "ArrayElementList": [
     "ArrayExpr",
   ],
-  "ArrayType": [
-    "TypeAnnotation",
-  ],
   "CodeBlockItemList": [
     "CodeBlock",
   ],
   "DeclBuildable": [
     "CodeBlockItem",
     "MemberDeclListItem",
   ],
-  "DictionaryType": [
-    "TypeAnnotation",
-  ],
   "ExprBuildable": [
     "CodeBlockItem",
     "InitializerClause",
@@ -53,7 +47,6 @@ let SYNTAX_BUILDABLE_EXPRESSIBLE_AS_CONFORMANCES: [String: [String]] = [
     "TupleExprElement",
   ],
   "SimpleTypeIdentifier": [
-    "TypeAnnotation",
     "TypeExpr",
   ],
   "StmtBuildable": [
@@ -67,5 +60,6 @@ let SYNTAX_BUILDABLE_EXPRESSIBLE_AS_CONFORMANCES: [String: [String]] = [
   "TypeBuildable": [
     "ReturnClause",
     "TypeInitializerClause",
+    "TypeAnnotation",
   ],
 ]