Merge pull request swiftlang#18783 from rintaro/parse-stmtcondition-recover-rdar43395202

[Parse] Recover missing initializer in stmt condition

Author: rintaro

lib/Parse/ParseStmt.cpp

@@ -1474,23 +1474,25 @@ Parser::parseStmtConditionElement(SmallVectorImpl<StmtConditionElement> &result,
   }
 
   // Conditional bindings must have an initializer.
-  Expr *Init;
+  ParserResult<Expr> Init;
   if (Tok.is(tok::equal)) {
     SyntaxParsingContext InitCtxt(SyntaxContext, SyntaxKind::InitializerClause);
     consumeToken();
-    ParserResult<Expr> InitExpr =
-        parseExprBasic(diag::expected_expr_conditional_var);
-    Init = InitExpr.getPtrOrNull();
-    if (InitExpr.hasCodeCompletion())
-      Status.setHasCodeCompletion();
+    Init = parseExprBasic(diag::expected_expr_conditional_var);
   } else {
-    // Although we require an initializer, recover by parsing as if it were
-    // merely omitted.
     diagnose(Tok, diag::conditional_var_initializer_required);
-    Init = new (Context) ErrorExpr(ThePattern.get()->getEndLoc());
   }
-  
-  result.push_back({IntroducerLoc, ThePattern.get(), Init});
+
+  if (Init.hasCodeCompletion())
+    Status.setHasCodeCompletion();
+
+  if (Init.isNull()) {
+    // Recover by creating ErrorExpr.
+    Init = makeParserResult(new (Context)
+                                ErrorExpr(ThePattern.get()->getEndLoc()));
+  }
+
+  result.push_back({IntroducerLoc, ThePattern.get(), Init.get()});
 
   // Add variable bindings from the pattern to our current scope and mark
   // them as being having a non-pattern-binding initializer.

test/IDE/complete_stmt_controlling_expr.swift

@@ -110,11 +110,13 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IF_LET_BIND_1 | %FileCheck %s -check-prefix=FOOSTRUCT_DOT_BOOL
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IF_LET_BIND_2 | %FileCheck %s -check-prefix=FOOSTRUCT_DOT_BOOL
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IF_LET_BIND_3 | %FileCheck %s -check-prefix=FOOSTRUCT_DOT
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IF_LET_BIND_4 | %FileCheck %s -check-prefix=FOOSTRUCT_NODOT
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GUARD_LET_BIND_1 | %FileCheck %s -check-prefix=FOOSTRUCT_DOT_BOOL
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GUARD_LET_BIND_2 | %FileCheck %s -check-prefix=FOOSTRUCT_DOT_BOOL
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GUARD_LET_BIND_3 | %FileCheck %s -check-prefix=FOOSTRUCT_DOT_BOOL
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GUARD_LET_BIND_4 | %FileCheck %s -check-prefix=FOOSTRUCT_DOT_BOOL
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GUARD_LET_BIND_5 | %FileCheck %s -check-prefix=FOOSTRUCT_DOT
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GUARD_LET_BIND_6 | %FileCheck %s -check-prefix=FOOSTRUCT_NODOT
 
 
 struct FooStruct {
@@ -582,6 +584,9 @@ func testIfLetBinding2(x: FooStruct?) {
 func testIfLetBinding3(x: FooStruct?) {
   if let y = x, let z = y.#^IF_LET_BIND_3^# {}
 }
+func testIfLetBinding3(x: FooStruct?) {
+  if let y = x, let z = y#^IF_LET_BIND_4^# {}
+}
 func testGuardLetBinding1(x: FooStruct?) {
   guard let y = x, y.#^GUARD_LET_BIND_1^# else {}
 }
@@ -597,6 +602,9 @@ func testGuardLetBinding4(x: FooStruct?) {
 func testGuardLetBinding5(x: FooStruct?) {
   guard let y = x, let z = y.#^GUARD_LET_BIND_5^# else {}
 }
+func testGuardLetBinding5(x: FooStruct?) {
+  guard let y = x, z = y#^GUARD_LET_BIND_6^# else {}
+}
 
 // FOOSTRUCT_DOT: Begin completions
 // FOOSTRUCT_DOT-DAG: Decl[InstanceVar]/CurrNominal:      instanceVar[#Int#];
@@ -609,3 +617,9 @@ func testGuardLetBinding5(x: FooStruct?) {
 // FOOSTRUCT_DOT_BOOL-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Identical]: boolGen()[#Bool#];
 // FOOSTRUCT_DOT_BOOL-DAG: Decl[InstanceMethod]/CurrNominal:   intGen()[#Int#];
 // FOOSTRUCT_DOT_BOOL: End completions
+
+// FOOSTRUCT_NODOT: Begin completions
+// FOOSTRUCT_NODOT-DAG: Decl[InstanceVar]/CurrNominal:      .instanceVar[#Int#];
+// FOOSTRUCT_NODOT-DAG: Decl[InstanceMethod]/CurrNominal:   .boolGen()[#Bool#];
+// FOOSTRUCT_NODOT-DAG: Decl[InstanceMethod]/CurrNominal:   .intGen()[#Int#];
+// FOOSTRUCT_NODOT: End completions