Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(eslint-plugin): [return-await] correct autofixer in binary expression #4401

Merged
merged 5 commits into from Mar 1, 2022
Merged

fix(eslint-plugin): [return-await] correct autofixer in binary expression #4401

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4477fb7
fix(eslint-plugin): return-await in binary expression
islandryu Jan 7, 2022
9c30915
fix(eslint-plugin): [return-await] add ( ) to Expressions with lower …
islandryu Jan 18, 2022
9a3bf15
Merge branch 'main' of https://github.com/islandryu/typescript-eslint…
islandryu Jan 29, 2022
6402c6f
fix(eslint-plugin): [return-await] add test
islandryu Jan 30, 2022
dbf7e4a
Merge branch 'main' into fixReturnAwaitInBinaryExpression
islandryu Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 24 additions & 7 deletions packages/eslint-plugin/src/rules/return-await.ts
View file
Open in desktop
Expand Up @@ -4,8 +4,10 @@ import {
TSESTree,
} from '@typescript-eslint/experimental-utils';
import * as tsutils from 'tsutils';
import { isBinaryExpression } from 'tsutils';
import * as ts from 'typescript';
import * as util from '../util';
import { getOperatorPrecedence } from '../util/getOperatorPrecedence';

type FunctionNode =
| TSESTree.FunctionDeclaration
Expand Down Expand Up @@ -153,15 +155,28 @@ export default util.createRule({
function insertAwait(
fixer: TSESLint.RuleFixer,
node: TSESTree.Expression,
isHighPrecendence: boolean,
): TSESLint.RuleFix | TSESLint.RuleFix[] {
if (node.type !== AST_NODE_TYPES.TSAsExpression) {
if (isHighPrecendence) {
return fixer.insertTextBefore(node, 'await ');
} else {
return [
fixer.insertTextBefore(node, 'await ('),
fixer.insertTextAfter(node, ')'),
];
}
}

return [
fixer.insertTextBefore(node, 'await ('),
fixer.insertTextAfter(node, ')'),
];
function isHigherPrecedenceThanAwait(node: ts.Node): boolean {
const operator = isBinaryExpression(node)
? node.operatorToken.kind
: ts.SyntaxKind.Unknown;
const nodePrecedence = getOperatorPrecedence(node.kind, operator);
const awaitPrecedence = getOperatorPrecedence(
ts.SyntaxKind.AwaitExpression,
ts.SyntaxKind.Unknown,
);
return nodePrecedence > awaitPrecedence;
}

function test(node: TSESTree.Expression, expression: ts.Node): void {
Expand Down Expand Up @@ -212,7 +227,8 @@ export default util.createRule({
context.report({
messageId: 'requiredPromiseAwait',
node,
fix: fixer => insertAwait(fixer, node),
fix: fixer =>
insertAwait(fixer, node, isHigherPrecedenceThanAwait(expression)),
});
}

Expand Down Expand Up @@ -251,7 +267,8 @@ export default util.createRule({
context.report({
messageId: 'requiredPromiseAwait',
node,
fix: fixer => insertAwait(fixer, node),
fix: fixer =>
insertAwait(fixer, node, isHigherPrecedenceThanAwait(expression)),
});
}

Expand Down