Add default conformance to syntax collection

Author: kimdv

Sources/SwiftSyntaxBuilder/Buildables.swift.gyb

@@ -4,6 +4,7 @@
   from gyb_syntax_support.kinds import SYNTAX_BASE_KINDS
   from gyb_syntax_support.kinds import syntax_buildable_child_type, syntax_buildable_default_init_value
   from gyb_syntax_support.protocolsMap import SYNTAX_BUILDABLE_EXPRESSIBLE_BY_CONFORMANCES
+  SYNTAX_COLLECTION_EXPRESSIBLE_BY_CONFORMANCES = syntax_collection_element_to_collection_mapping()
   # -*- mode: Swift -*-
   # Ignore the following admonition it applies to the resulting .swift file only
 }%
@@ -42,8 +43,10 @@ public protocol ${kind}ListBuildable: SyntaxListBuildable {
 
 %     buildable_type = kind + 'Buildable'
 %     expressible_by_type = 'ExpressibleBy' + buildable_type
-%     expressible_by_protocols = SYNTAX_BUILDABLE_EXPRESSIBLE_BY_CONFORMANCES.get(expressible_by_type)
-%     if expressible_by_protocols:
+%     expressible_by_protocols = SYNTAX_COLLECTION_EXPRESSIBLE_BY_CONFORMANCES.get(buildable_type) or []
+%     expressible_by_protocols += SYNTAX_BUILDABLE_EXPRESSIBLE_BY_CONFORMANCES.get(buildable_type) or []
+%     expressible_by_protocols = map(lambda x : 'ExpressibleBy' +x, expressible_by_protocols)
+%     if expressible_by_protocols and expressible_by_protocols is not []:
 public protocol ${expressible_by_type}: ${', '.join(expressible_by_protocols)} {
 %     else:
 public protocol ${expressible_by_type} {
@@ -220,8 +223,10 @@ public struct ${node.syntax_kind}: SyntaxBuildable {
 %   end
 %   if node.is_buildable() or node.is_syntax_collection():
 %     expressible_by_type = 'ExpressibleBy' + node.syntax_kind
-%     expressible_by_protocols = SYNTAX_BUILDABLE_EXPRESSIBLE_BY_CONFORMANCES.get(expressible_by_type)
-%     if expressible_by_protocols:
+%     expressible_by_protocols = SYNTAX_COLLECTION_EXPRESSIBLE_BY_CONFORMANCES.get(node.syntax_kind) or []
+%     expressible_by_protocols += SYNTAX_BUILDABLE_EXPRESSIBLE_BY_CONFORMANCES.get(node.syntax_kind) or []
+%     expressible_by_protocols = map(lambda x : 'ExpressibleBy' +x, expressible_by_protocols)
+%     if expressible_by_protocols and expressible_by_protocols is not []:
 public protocol ${expressible_by_type}: ${', '.join(expressible_by_protocols)} {
 %     else:
 public protocol ${expressible_by_type} {
@@ -249,37 +254,40 @@ extension TokenSyntax: ExpressibleByTokenSyntax {
 
 // MARK: - Syntax buildable expressible by conformances
 
-% for protocol, conformances in SYNTAX_BUILDABLE_EXPRESSIBLE_BY_CONFORMANCES.items():
-%   if 'ExpressibleByConditionElementList' in conformances:
-extension ${protocol} {
-  public func createConditionElementList() -> ConditionElementList {
-    ConditionElementList([self])
+% for protocol, conformances in SYNTAX_COLLECTION_EXPRESSIBLE_BY_CONFORMANCES.items():
+%   for conformance in conformances:
+extension ExpressibleBy${protocol} {
+  public func create${conformance}() -> ${conformance} {
+    ${conformance}([self])
   }
 }
 
 %   end
-%   if 'ExpressibleByConditionElement' in conformances:
-extension ${protocol} {
+% end
+
+% for protocol, conformances in SYNTAX_BUILDABLE_EXPRESSIBLE_BY_CONFORMANCES.items():
+%   if 'ConditionElement' in conformances:
+extension ExpressibleBy${protocol} {
   public func createConditionElement() -> ConditionElement {
     ConditionElement(condition: self)
   }
 }
 
 %   end
-%   if 'ExpressibleByCodeBlockItem' in conformances:
-extension ${protocol} {
+%   if 'CodeBlockItem' in conformances:
+extension ExpressibleBy${protocol} {
   public func createCodeBlockItem() -> CodeBlockItem {
     CodeBlockItem(item: self)
   }
 }
 
 %   end
-%   if 'ExpressibleByMemberDeclListItem' in conformances:
-extension ${protocol} {
+%   if 'MemberDeclListItem' in conformances:
+extension ExpressibleBy${protocol} {
   public func createMemberDeclListItem() -> MemberDeclListItem {
     MemberDeclListItem(decl: self)
   }
 }
 
 %   end
-% end
+% end