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.
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
fix(eslint-plugin): [promise-function-async] bad fixer with computed and literal methods #3163
Merged
bradzacher
merged 3 commits into
typescript-eslint:master
from
phaux:prom-func-async-fixer-bug
Mar 18, 2021
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,7 +1,9 @@ | ||||||
import { | ||||||
AST_NODE_TYPES, | ||||||
AST_TOKEN_TYPES, | ||||||
TSESTree, | ||||||
} from '@typescript-eslint/experimental-utils'; | ||||||
import { last } from 'lodash'; | ||||||
import * as ts from 'typescript'; | ||||||
import * as util from '../util'; | ||||||
|
||||||
|
@@ -156,8 +158,39 @@ export default util.createRule<Options, MessageIds>({ | |||||
(node.parent.type === AST_NODE_TYPES.Property && | ||||||
node.parent.method)) | ||||||
) { | ||||||
return fixer.insertTextBefore(node.parent.key, 'async '); | ||||||
// this function is a class method or object function property shorthand | ||||||
const method = node.parent; | ||||||
|
||||||
/** the token to put `async` before */ | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nitpick
Suggested change
|
||||||
let keyToken = sourceCode.getFirstToken(method)!; | ||||||
|
||||||
// if there are decorators then skip past them | ||||||
if ( | ||||||
method.type === AST_NODE_TYPES.MethodDefinition && | ||||||
method.decorators | ||||||
) { | ||||||
const lastDecorator = last(method.decorators)!; | ||||||
keyToken = sourceCode.getTokenAfter(lastDecorator)!; | ||||||
} | ||||||
|
||||||
// if current token is a keyword like `static` or `public` then skip it | ||||||
while (keyToken.type === AST_TOKEN_TYPES.Keyword) { | ||||||
keyToken = sourceCode.getTokenAfter(keyToken)!; | ||||||
} | ||||||
|
||||||
// check if there is a space between key and previous token | ||||||
const insertSpace = !sourceCode.isSpaceBetween!( | ||||||
sourceCode.getTokenBefore(keyToken)!, | ||||||
keyToken, | ||||||
); | ||||||
|
||||||
let code = 'async '; | ||||||
if (insertSpace) { | ||||||
code = ` ${code}`; | ||||||
} | ||||||
return fixer.insertTextBefore(keyToken, code); | ||||||
} | ||||||
|
||||||
return fixer.insertTextBefore(node, 'async '); | ||||||
}, | ||||||
}); | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we'd rather avoid adding a dependency on lodash for such trivial things.
Please inline the function impl!