Merge pull request #36738 from nathawes/fix-completion-crash

Nathan Hawes · web-flow · commit 927c709a508f · 2021-04-06T15:54:44.000+10:00
[CodeCompletion][Parse] Don't drop the contained expression when completing within an InOutExpr
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
@@ -533,7 +533,7 @@ ParserResult<Expr> Parser::parseExprUnary(Diag<> Message, bool isExprBasic) {
 
     ParserResult<Expr> SubExpr = parseExprUnary(Message, isExprBasic);
     if (SubExpr.hasCodeCompletion())
-      return makeParserCodeCompletionResult<Expr>();
+      return makeParserCodeCompletionResult<Expr>(SubExpr.getPtrOrNull());
     if (SubExpr.isNull())
       return nullptr;
     return makeParserResult(
diff --git a/validation-test/IDE/crashers_2_fixed/rdar75366814.swift b/validation-test/IDE/crashers_2_fixed/rdar75366814.swift
@@ -0,0 +1,3 @@
+// RUN: %swift-ide-test -code-completion -code-completion-token=COMPLETE -source-filename %s
+
+if undefined(&self.#^COMPLETE^#

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// RUN: %swift-ide-test -code-completion -code-completion-token=COMPLETE -source-filename %s`
	`2`	`+`
	`3`	`+if undefined(&self.#^COMPLETE^#`