Merge pull request #42184 from ahoppen/pr/migrage-accessorbeginning-solver-based

[5.7][CodeCompletion] Migrate AccessorBeginning to solver-based

Author: ahoppen

lib/IDE/CodeCompletion.cpp

@@ -1404,20 +1404,31 @@ bool CodeCompletionCallbacksImpl::trySolverCompletion(bool MaybeFuncBody) {
                           CurDeclContext, CompletionContext, Consumer);
     return true;
   }
-  case CompletionKind::StmtOrExpr:
+  case CompletionKind::AccessorBeginning:
   case CompletionKind::ForEachSequence:
-  case CompletionKind::PostfixExprBeginning: {
-    assert(CodeCompleteTokenExpr);
+  case CompletionKind::PostfixExprBeginning:
+  case CompletionKind::StmtOrExpr: {
     assert(CurDeclContext);
 
     ExprTypeCheckCompletionCallback Lookup(CodeCompleteTokenExpr,
                                            CurDeclContext);
-    llvm::SaveAndRestore<TypeCheckCompletionCallback *> CompletionCollector(
-        Context.CompletionCallback, &Lookup);
-    typeCheckContextAt(CurDeclContext, CompletionLoc);
-
-    if (!Lookup.gotCallback()) {
-      Lookup.fallbackTypeCheck(CurDeclContext);
+    if (CodeCompleteTokenExpr) {
+      // 'CodeCompletionTokenExpr == nullptr' happens when completing e.g.
+      //   var x: Int {
+      //     get { ... }
+      //     #^COMPLETE^#
+      //   }
+      // In this case we don't want to provide any expression results. We still
+      // need to have a TypeCheckCompletionCallback so we can call
+      // deliverResults on it to deliver the keyword results from the completion
+      // context's result sink to the consumer.
+      llvm::SaveAndRestore<TypeCheckCompletionCallback *> CompletionCollector(
+          Context.CompletionCallback, &Lookup);
+      typeCheckContextAt(CurDeclContext, CompletionLoc);
+
+      if (!Lookup.gotCallback()) {
+        Lookup.fallbackTypeCheck(CurDeclContext);
+      }
     }
 
     addKeywords(CompletionContext.getResultSink(), MaybeFuncBody);
@@ -1571,6 +1582,7 @@ void CodeCompletionCallbacksImpl::doneParsing() {
   case CompletionKind::ForEachSequence:
   case CompletionKind::PostfixExprBeginning:
   case CompletionKind::AfterPoundExpr:
+  case CompletionKind::AccessorBeginning:
     llvm_unreachable("should be already handled");
     return;
 
@@ -1687,16 +1699,6 @@ void CodeCompletionCallbacksImpl::doneParsing() {
     break;
   }
 
-  case CompletionKind::AccessorBeginning: {
-    if (isa<AccessorDecl>(ParsedDecl)) {
-      ExprContextInfo ContextInfo(CurDeclContext, CodeCompleteTokenExpr);
-      Lookup.setExpectedTypes(ContextInfo.getPossibleTypes(),
-                              ContextInfo.isImplicitSingleExpressionReturn());
-      DoPostfixExprBeginning();
-    }
-    break;
-  }
-
   case CompletionKind::AttributeBegin: {
     Lookup.getAttributeDeclCompletions(IsInSil, AttTargetDK);
 

lib/Parse/ParseDecl.cpp

@@ -7377,12 +7377,16 @@ Parser::parseAbstractFunctionBodyImpl(AbstractFunctionDecl *AFD) {
       SourceLoc LBraceLoc, RBraceLoc;
       LBraceLoc = consumeToken(tok::l_brace);
       auto *CCE = new (Context) CodeCompletionExpr(Tok.getLoc());
+      auto *Return =
+          new (Context) ReturnStmt(SourceLoc(), CCE, /*implicit=*/true);
       CodeCompletion->setParsedDecl(accessor);
       CodeCompletion->completeAccessorBeginning(CCE);
       RBraceLoc = Tok.getLoc();
       consumeToken(tok::code_complete);
-      auto *BS = BraceStmt::create(Context, LBraceLoc, ASTNode(CCE), RBraceLoc,
-                                   /*implicit*/ true);
+      auto *BS =
+          BraceStmt::create(Context, LBraceLoc, ASTNode(Return), RBraceLoc,
+                            /*implicit*/ true);
+      AFD->setHasSingleExpressionBody();
       AFD->setBodyParsed(BS);
       return {BS, Fingerprint::ZERO()};
     }