From 984956afec35a0b1b4613de1b13dad99d25d0deb Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Wed, 7 Aug 2019 11:27:36 -0700
Subject: [PATCH] Only add unnecessary-await suggestion on await expressions
 (#32754)

---
 src/compiler/checker.ts                                  | 9 +++++----
 ...codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts | 8 ++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 tests/cases/fourslash/codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b8f80084482..e3da1993100 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -24037,7 +24037,11 @@ namespace ts {
             }
 
             const operandType = checkExpression(node.expression);
-            return checkAwaitedType(operandType, node, Diagnostics.Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+            const awaitedType = checkAwaitedType(operandType, node, Diagnostics.Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+            if (awaitedType === operandType && awaitedType !== errorType && !(operandType.flags & TypeFlags.AnyOrUnknown)) {
+                addErrorOrSuggestion(/*isError*/ false, createDiagnosticForNode(node, Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
+            }
+            return awaitedType;
         }
 
         function checkPrefixUnaryExpression(node: PrefixUnaryExpression): Type {
@@ -26537,9 +26541,6 @@ namespace ts {
          */
         function checkAwaitedType(type: Type, errorNode: Node, diagnosticMessage: DiagnosticMessage, arg0?: string | number): Type {
             const awaitedType = getAwaitedType(type, errorNode, diagnosticMessage, arg0);
-            if (awaitedType === type && !(type.flags & TypeFlags.AnyOrUnknown)) {
-                addErrorOrSuggestion(/*isError*/ false, createDiagnosticForNode(errorNode, Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
-            }
             return awaitedType || errorType;
         }
 
diff --git a/tests/cases/fourslash/codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts b/tests/cases/fourslash/codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts
new file mode 100644
index 00000000000..e2ecf88ec44
--- /dev/null
+++ b/tests/cases/fourslash/codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+// @target: esnext
+////async function fn(): Promise<number> {
+////  return 0;
+////}
+
+verify.getSuggestionDiagnostics([]);