Add convenience initializers for more nodes

Author: kimdv

Sources/SwiftSyntaxBuilder/BuildablesConvenienceInitializers.swift.gyb

@@ -5,7 +5,7 @@
   # -*- mode: Swift -*-
   # Ignore the following admonition it applies to the resulting .swift file only
 }%
-//// Automatically Generated From DeclBuildables.swift.gyb.
+//// Automatically Generated From BuildablesConvenienceInitializers.swift.gyb.
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 //
@@ -24,13 +24,19 @@ import SwiftSyntax
 % for node in SYNTAX_NODES:
 %   if node.is_buildable():
 %     has_syntax_collection_child = False
+%     has_token_child = False
 %     for child in node.children:
 %       child_node = NODE_MAP.get(child.syntax_kind)
+%       child_token = SYNTAX_TOKEN_MAP.get(child.syntax_kind)
 %       if child_node and child_node.is_syntax_collection():
+%         # If node have syntax collection as child, we can create a convenient initializer
 %         has_syntax_collection_child = True
+%       elif (child_token and (not child.is_optional or not child_token.text)) or child.syntax_kind is "IdentifierToken":
+%         # If the node have at least one child that is a token or identifier token, we can create a Cconvenient initializer
+%         has_token_child = True
 %       end
 %     end
-%     if has_syntax_collection_child:
+%     if has_syntax_collection_child or has_token_child:
 extension ${node.syntax_kind} {
   public init(
 %       init_parameters = []
@@ -45,18 +51,27 @@ extension ${node.syntax_kind} {
 %           # Allow initializing identifier or a token without a text with String value
 %           param_type = "String?" if child.is_optional else "String"
 %           init_parameters.append("%s: %s" % (child.swift_name, param_type))
-%         else:
-%           # When type is not handled above, use default value
+%         elif has_syntax_collection_child:
+%           # When node have a syntax collection as child we can use all parameters
 %           param_type = syntax_buildable_child_type(child.type_name, child.syntax_kind, child.is_token(), child.is_optional)
 %           default_value = ""
 %           if token and token.text and not child.is_optional:
 %             default_value = " = Tokens.`%s`" % lowercase_first_word(token.name)
 %           elif child.is_optional:
 %             default_value = " = nil"
 %           init_parameters.append("%s: %s%s" % (child.swift_name, param_type, default_value))
+%         elif not token or child.is_optional:
+%           # Allow initializing with parameter when there is no token or the parameter is optional
+%           param_type = syntax_buildable_child_type(child.type_name, child.syntax_kind, child.is_token(), child.is_optional)
+%           default_value = ""
+%           if child.is_optional:
+%             default_value = " = nil"
+%           init_parameters.append("%s: %s%s" % (child.swift_name, param_type, default_value))
 %         end
 %       end
+%       if bool(init_parameters):
     ${',\n    '.join(init_parameters)}
+%       end
   ) {
     self.init(
 %     init_parameters = []
@@ -71,11 +86,13 @@ extension ${node.syntax_kind} {
 %         else:
 %           init_parameters.append("%s: SyntaxFactory.makeIdentifier(%s)" % (child.swift_name, child.swift_name))
 %         end
+%       elif not child.is_optional and not has_syntax_collection_child and token and token.text:
+%           init_parameters.append("%s: Tokens.`%s`" % (child.swift_name, lowercase_first_word(token.name)))
 %       elif token and not token.text:
 %         if child.is_optional:
 %           init_parameters.append("%s: %s.map(Tokens.%s)" % (child.swift_name, child.swift_name, lowercase_first_word(token.name)))
 %         else:
-%           init_parameters.append("%s: Tokens.%s(%s)" % (child.swift_name, token.name, child.swift_name))
+%           init_parameters.append("%s: Tokens.%s(%s)" % (child.swift_name, lowercase_first_word(token.name), child.swift_name))
 %         end
 %       else:
 %         init_parameters.append("%s: %s" % (child.swift_name, child.swift_name))
@@ -88,4 +105,4 @@ extension ${node.syntax_kind} {
 
 %     end
 %   end
-% end
+% end