Merge pull request #16158 from nkcsgexi/synthesize-node

libSyntax: add a mechanism to synthesize syntax nodes in SyntaxParsingContext.

Author: nkcsgexi

include/swift/Parse/SyntaxParsingContext.h

@@ -255,6 +255,14 @@ class alignas(1 << SyntaxAlignInBits) SyntaxParsingContext {
   /// the syntax tree before closing the root context.
   void finalizeRoot();
 
+  /// Make a missing node corresponding to the given token kind and text, and
+  /// push this node into the context. The synthesized node can help
+  /// the creation of valid syntax nodes.
+  void synthesize(tok Kind, StringRef Text = "");
+
+  /// Make a missing node corresponding to the given node kind, and
+  /// push this node into the context.
+  void synthesize(SyntaxKind Kind);
 };
 
 } // namespace swift

lib/Parse/ParseStmt.cpp

@@ -637,8 +637,11 @@ ParserResult<BraceStmt> Parser::parseBraceItemList(Diag<> ID) {
 
   ParserStatus Status = parseBraceItems(Entries, BraceItemListKind::Brace,
                                         BraceItemListKind::Brace);
-  parseMatchingToken(tok::r_brace, RBLoc,
-                     diag::expected_rbrace_in_brace_stmt, LBLoc);
+  if (parseMatchingToken(tok::r_brace, RBLoc,
+                         diag::expected_rbrace_in_brace_stmt, LBLoc)) {
+    // Synthesize a r-brace if the source doesn't have any.
+    LocalContext.synthesize(tok::r_brace);
+  }
 
   return makeParserResult(Status,
                           BraceStmt::create(Context, LBLoc, Entries, RBLoc));

lib/Parse/SyntaxParsingContext.cpp

@@ -318,6 +318,20 @@ void SyntaxParsingContext::finalizeRoot() {
   getRootData().Storage.clear();
 }
 
+void SyntaxParsingContext::synthesize(tok Kind, StringRef Text) {
+  if (!Enabled)
+    return;
+  if (Text.empty())
+    Text = getTokenText(Kind);
+  Storage.push_back(RawSyntax::missing(Kind, Text));
+}
+
+void SyntaxParsingContext::synthesize(SyntaxKind Kind) {
+  if (!Enabled)
+    return;
+  Storage.push_back(RawSyntax::missing(Kind));
+}
+
 SyntaxParsingContext::~SyntaxParsingContext() {
   assert(isTopOfContextStack() && "destructed in wrong order");
 

test/Syntax/Outputs/round_trip_invalid.swift.withkinds

@@ -0,0 +1,14 @@
+<FunctionDecl>// RUN: rm -rf %t
+// RUN: %swift-syntax-test -input-source-filename %s -parse-gen > %t
+// RUN: diff -u %s %t
+// RUN: %swift-syntax-test -input-source-filename %s -parse-gen -print-node-kind > %t.withkinds
+// RUN: diff -u %S/Outputs/round_trip_invalid.swift.withkinds %t.withkinds
+// RUN: %swift-syntax-test -input-source-filename %s -eof > %t
+// RUN: diff -u %s %t
+// RUN: %swift-syntax-test -serialize-raw-tree -input-source-filename %s > %t.dump
+// RUN: %swift-syntax-test -deserialize-raw-tree -input-source-filename %t.dump -output-filename %t
+// RUN: diff -u %s %t
+
+// Function body without closing brace token.
+func foo<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{<VariableDecl>
+  var <PatternBinding><IdentifierPattern>a </IdentifierPattern><InitializerClause>= <IntegerLiteralExpr>2</IntegerLiteralExpr></InitializerClause></PatternBinding></VariableDecl></CodeBlock></FunctionDecl>

test/Syntax/round_trip_invalid.swift

@@ -0,0 +1,14 @@
+// RUN: rm -rf %t
+// RUN: %swift-syntax-test -input-source-filename %s -parse-gen > %t
+// RUN: diff -u %s %t
+// RUN: %swift-syntax-test -input-source-filename %s -parse-gen -print-node-kind > %t.withkinds
+// RUN: diff -u %S/Outputs/round_trip_invalid.swift.withkinds %t.withkinds
+// RUN: %swift-syntax-test -input-source-filename %s -eof > %t
+// RUN: diff -u %s %t
+// RUN: %swift-syntax-test -serialize-raw-tree -input-source-filename %s > %t.dump
+// RUN: %swift-syntax-test -deserialize-raw-tree -input-source-filename %t.dump -output-filename %t
+// RUN: diff -u %s %t
+
+// Function body without closing brace token.
+func foo() {
+  var a = 2