[Parse] Don't drop throws containing a code completion expression.

Author: Nathan Hawes

lib/Parse/ParseStmt.cpp

@@ -898,9 +898,7 @@ ParserResult<Stmt> Parser::parseStmtThrow(SourceLoc tryLoc) {
     exprLoc = Tok.getLoc();
 
   ParserResult<Expr> Result = parseExpr(diag::expected_expr_throw);
-
-  if (Result.hasCodeCompletion())
-    return makeParserCodeCompletionResult<Stmt>();
+  bool hasCodeCompletion = Result.hasCodeCompletion();
 
   if (Result.isNull())
     Result = makeParserErrorResult(new (Context) ErrorExpr(throwLoc));
@@ -916,6 +914,9 @@ ParserResult<Stmt> Parser::parseStmtThrow(SourceLoc tryLoc) {
       Result = makeParserResult(new (Context) TryExpr(exprLoc, Result.get()));
   }
 
+  if (hasCodeCompletion)
+    Result.setHasCodeCompletion();
+
   return makeParserResult(Result,
               new (Context) ThrowStmt(throwLoc, Result.get()));
 }

test/IDE/complete_exception.swift

@@ -5,11 +5,13 @@
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CATCH2 | %FileCheck %s -check-prefix=CATCH2
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=THROW2 | %FileCheck %s -check-prefix=THROW2
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=CATCH3 | %FileCheck %s -check-prefix=CATCH3
+// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=THROW3 | %FileCheck %s -check-prefix=THROW3
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_CATCH1 | %FileCheck %s -check-prefix=CATCH1
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_THROW1 | %FileCheck %s -check-prefix=THROW1
 
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_CATCH2 | %FileCheck %s -check-prefix=CATCH2
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_THROW2 | %FileCheck %s -check-prefix=THROW2
+// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=TOP_LEVEL_THROW3 | %FileCheck %s -check-prefix=THROW3
 
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=INSIDE_CATCH1 > %t.inside_catch1
 // RUN: %FileCheck %s -check-prefix=STMT < %t.inside_catch1
@@ -126,11 +128,20 @@ func test005() {
 // CATCH3: End completions
 }
 
+func testInvalid() {
+  try throw Error4.#^THROW3^#
+// THROW3: Begin completions
+// THROW3: Decl[EnumElement]/CurrNominal:      E1[#Error4#]{{; name=.+$}}
+// THROW3: Decl[EnumElement]/CurrNominal:      E2({#Int32#})[#Error4#]{{; name=.+$}}
+// THROW3: End completions
+}
+
 //===--- Top-level throw/catch
 do {} catch #^TOP_LEVEL_CATCH1^# {}
 throw #^TOP_LEVEL_THROW1^#
 do {} catch Error4.#^TOP_LEVEL_CATCH2^# {}
 throw Error4.#^TOP_LEVEL_THROW2^#
+try throw Error4.#^TOP_LEVEL_THROW3^#
 
 //===--- Inside catch body