Merge pull request swiftlang#12811 from nkcsgexi/lib-syntax-gyb-blank-collection

Author: swift-ci

include/swift/Syntax/SyntaxFactory.h.gyb

@@ -56,6 +56,9 @@ struct SyntaxFactory {
 
   static SyntaxKind getUnknownKind(SyntaxKind Kind);
 
+  static Syntax
+  makeBlankCollectionSyntax(SyntaxKind Kind);
+
 % for node in SYNTAX_NODES:
 %   if node.children:
 %     child_params = []

lib/Syntax/SyntaxFactory.cpp.gyb

@@ -57,6 +57,18 @@ SyntaxFactory::makeUnknownSyntax(llvm::ArrayRef<TokenSyntax> Tokens) {
   return make<UnknownSyntax>(Raw);
 }
 
+Syntax SyntaxFactory::makeBlankCollectionSyntax(SyntaxKind Kind) {
+  switch(Kind) {
+% for node in SYNTAX_NODES:
+%   if node.is_syntax_collection():
+  case SyntaxKind::${node.syntax_kind}: return makeBlank${node.syntax_kind}();
+%   end
+% end
+  default: break;
+  }
+  llvm_unreachable("not collection kind.");
+}
+
 Optional<Syntax>
 SyntaxFactory::createSyntax(SyntaxKind Kind, llvm::ArrayRef<Syntax> Elements) {
   switch(Kind) {

lib/Syntax/SyntaxParsingContext.cpp

@@ -317,22 +317,12 @@ void SyntaxParsingContextChild::makeNodeWhole(SyntaxKind Kind) {
     ContextData.createWhole(Kind, AllNodes);
     break;
   }
+  case SyntaxKind::StmtList:
   case SyntaxKind::FunctionCallArgumentList: {
     if (AllNodes.empty()) {
       // Create an empty argument list if no arguments are in the context.
       RawSyntaxInfo Empty(SyntaxFactory::
-                          makeBlankFunctionCallArgumentList().getRaw());
-      Empty.setBeforeLoc(EndLoc);
-      ContextData.addPendingSyntax(Empty);
-    } else {
-      ContextData.createWhole(Kind, AllNodes);
-    }
-    break;
-  }
-  case SyntaxKind::StmtList: {
-    if (AllNodes.empty()) {
-      // Create an empty statement list if no statement is in the context.
-      RawSyntaxInfo Empty(SyntaxFactory::makeBlankStmtList().getRaw());
+                          makeBlankCollectionSyntax(Kind).getRaw());
       Empty.setBeforeLoc(EndLoc);
       ContextData.addPendingSyntax(Empty);
     } else {