Don't add redundant await in completions (#52677)

Author: zardoy

src/services/completions.ts

@@ -117,6 +117,7 @@ import {
     isAbstractConstructorSymbol,
     isArrowFunction,
     isAssertionExpression,
+    isAwaitExpression,
     isBigIntLiteral,
     isBinaryExpression,
     isBindingElement,
@@ -1319,7 +1320,9 @@ function createCompletionEntry(
 
         awaitText += `(await ${propertyAccessToConvert.expression.getText()})`;
         insertText = needsConvertPropertyAccess ? `${awaitText}${insertText}` : `${awaitText}${insertQuestionDot ? "?." : "."}${insertText}`;
-        replacementSpan = createTextSpanFromBounds(propertyAccessToConvert.getStart(sourceFile), propertyAccessToConvert.end);
+        const isInAwaitExpression = tryCast(propertyAccessToConvert.parent, isAwaitExpression);
+        const wrapNode = isInAwaitExpression ? propertyAccessToConvert.parent : propertyAccessToConvert.expression;
+        replacementSpan = createTextSpanFromBounds(wrapNode.getStart(sourceFile), propertyAccessToConvert.end);
     }
 
     if (originIsResolvedExport(origin)) {

tests/cases/fourslash/completionOfAwaitPromiseNoRedundant.ts

@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+//// interface Foo { foo: string }
+//// async function foo(x: (a: number) => Promise<Foo>) {
+////    [|await x(1)./*1*/|]
+////    ;([|await x(1)./*2*/|])
+////    ;(await ([|x(1)./*3*/|]))
+//// }
+
+for (const marker of [1, 2, 3]) {
+    verify.completions({
+        marker: marker.toString(),
+        includes: [
+            "then",
+            { name: "foo", insertText: '(await x(1)).foo', replacementSpan: test.ranges()[marker - 1] },
+        ],
+        preferences: {
+            includeInsertTextCompletions: true,
+        },
+    });
+}