maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve accuracy of remove unnecessary await fix (#32384)

Browse source
This commit is contained in:
Andrew Branch 2019-07-15 15:17:32 -07:00 committed by GitHub
parent 17762c480d
commit 7cdfbceb43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/factory.ts
View file

@ -4701,7 +4701,7 @@ namespace ts {
}
}
function getLeftmostExpression(node: Expression, stopAtCallExpressions: boolean) {
export function getLeftmostExpression(node: Expression, stopAtCallExpressions: boolean) {
while (true) {
switch (node.kind) {
case SyntaxKind.PostfixUnaryExpression:

16
src/services/codefixes/removeUnnecessaryAwait.ts
View file

@ -26,8 +26,18 @@ namespace ts.codefix {
return;
}
const parenthesizedExpression = tryCast(awaitExpression.parent, isParenthesizedExpression);
const removeParens = parenthesizedExpression && (isIdentifier(awaitExpression.expression) || isCallExpression(awaitExpression.expression));
changeTracker.replaceNode(sourceFile, removeParens ? parenthesizedExpression || awaitExpression : awaitExpression, awaitExpression.expression);
let expressionToReplace: Node = awaitExpression;
const hasSurroundingParens = isParenthesizedExpression(awaitExpression.parent);
if (hasSurroundingParens) {
const leftMostExpression = getLeftmostExpression(awaitExpression.expression, /*stopAtCallExpressions*/ false);
if (isIdentifier(leftMostExpression)) {
const precedingToken = findPrecedingToken(awaitExpression.parent.pos, sourceFile);
if (precedingToken && precedingToken.kind !== SyntaxKind.NewKeyword) {
expressionToReplace = awaitExpression.parent;
}
}
}
changeTracker.replaceNode(sourceFile, expressionToReplace, awaitExpression.expression);
}
}

9
tests/cases/fourslash/codeFixRemoveUnnecessaryAwait.ts
View file

@ -1,5 +1,6 @@
/// <reference path="fourslash.ts" />
////declare class C { foo(): void }
////declare function getC(): { Class: C };
////declare function foo(): string;
////async function f() {
//// await "";
@ -7,6 +8,8 @@
//// (await foo()).toLowerCase();
//// (await 0).toFixed();
//// (await new C).foo();
//// (await function() { }());
//// new (await getC()).Class();
////}
verify.codeFix({
@ -14,6 +17,7 @@ verify.codeFix({
index: 0,
newFileContent:
`declare class C { foo(): void }
declare function getC(): { Class: C };
declare function foo(): string;
async function f() {
"";
@ -21,6 +25,8 @@ async function f() {
(await foo()).toLowerCase();
(await 0).toFixed();
(await new C).foo();
(await function() { }());
new (await getC()).Class();
}`
});
@ -29,6 +35,7 @@ verify.codeFixAll({
fixId: "removeUnnecessaryAwait",
newFileContent:
`declare class C { foo(): void }
declare function getC(): { Class: C };
declare function foo(): string;
async function f() {
"";
@ -36,5 +43,7 @@ async function f() {
foo().toLowerCase();
(0).toFixed();
(new C).foo();
(function() { } ());
new (getC()).Class();
}`
});