Merge pull request #37324 from rintaro/ide-completion-rdar75358153

[CodeCompletion] Reset 'hasSingleExpressionBody' when setting function body

Author: rintaro

lib/Parse/ParseDecl.cpp

@@ -7075,8 +7075,10 @@ BraceStmt *Parser::parseAbstractFunctionBodyImpl(AbstractFunctionDecl *AFD) {
     return nullptr;
 
   BraceStmt *BS = Body.get();
+  // Reset the single expression body status.
+  AFD->setHasSingleExpressionBody(false);
   AFD->setBodyParsed(BS);
-  
+
   if (Parser::shouldReturnSingleExpressionElement(BS->getElements())) {
     auto Element = BS->getLastElement();
     if (auto *stmt = Element.dyn_cast<Stmt *>()) {

test/SourceKit/CodeComplete/complete_sequence_rdar75358153.swift

@@ -0,0 +1,47 @@
+// BEGIN t1.swift
+enum E {
+  case foo, bar
+}
+func foo(_ arg: E) {}
+func test(val: E) {
+  foo(.bar)
+}
+
+// BEGIN t2.swift
+enum E {
+  case foo, bar
+}
+func foo(_ arg: E) {}
+func test(val: E) {
+  foo(.bar)
+  if v
+}
+
+// BEGIN dummy.swift
+
+// rdar://75358153
+// Previously, completing inside single expression body, then completing inside
+// *non* single expression body in the same function caused a crash because the
+// "has single expression" flag didn't cleard. This file tests the scenario not
+// to regress again.
+
+// RUN: %empty-directory(%t)
+// RUN: %{python} %utils/split_file.py -o %t %s
+
+// RUN: %sourcekitd-test \
+// RUN:   -req=complete -pos=6:8 -text-input %t/t1.swift %t/t.swift -- %t/t.swift == \
+// RUN:   -req=complete -pos=7:6 -text-input %t/t2.swift %t/t.swift -- %t/t.swift \
+// RUN: | %FileCheck %s
+
+// CHECK-LABEL: key.results: [
+// CHECK-DAG: key.description: "bar",
+// CHECK-DAG: key.description: "foo",
+// CHECK-DAG: key.description: "hash(self: E)",
+// CHECK: ]
+// CHECK-NOT: key.reusingastcontext: 1
+
+// CHECK-LABEL: key.results: [
+// CHECK-DAG: key.description: "val",
+// CHECK-DAG: key.description: "foo(arg: E)",
+// CHECK: ],
+// CHECK: key.reusingastcontext: 1