Use correct type for async refactoring diagnostics #26749
Merged
Conversation
This file contains hidden or 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
added 7 commits
August 29, 2018 15:49
uniqueiniquity
assigned RyanCavanaugh, amcasey and ghost
and unassigned RyanCavanaugh, amcasey and ghost
amcasey
reviewed
Aug 29, 2018
| @@ -1178,11 +1188,17 @@ function [#|f|]() { | |||
| } | |||
| `); | |||
|
|
|||
| _testConvertToAsyncFunction("convertToAsyncFunction_simpleFunctionExpression", ` | |||
| const [#|foo|] = function () { | |||
There was a problem hiding this comment.
[#|foo|] [](start = 6, length = 8)
I realize you didn't change this, but that seems like a weird place for the squiggle. What if the function had a name?
There was a problem hiding this comment.
Tracked at #26801.
ghost
approved these changes
Aug 30, 2018
| @@ -42,7 +42,18 @@ namespace ts.codefix { | |||
|
|
|||
| function convertToAsyncFunction(changes: textChanges.ChangeTracker, sourceFile: SourceFile, position: number, checker: TypeChecker, context: CodeFixContextBase): void { | |||
| // get the function declaration - returns a promise | |||
| const functionToConvert: FunctionLikeDeclaration = getContainingFunction(getTokenAtPosition(sourceFile, position)) as FunctionLikeDeclaration; | |||
| const tokenAtPosition = getTokenAtPosition(sourceFile, position); | |||
| let functionToConvert: FunctionLikeDeclaration; | |||
There was a problem hiding this comment.
let functionToConvert: FunctionLikeDeclaration | undefined;, since getContainingFunction may return undefined.
| functionToConvert = tokenAtPosition.parent.initializer; | ||
| } | ||
| else { | ||
| functionToConvert = getContainingFunction(getTokenAtPosition(sourceFile, position)) as FunctionLikeDeclaration; |
There was a problem hiding this comment.
Could use tryCast(..., isFunctionLikeDeclaration)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #26374, supersedes #26720 .
This PR aims to fix a few issues:
FunctionLikeDeclaration. Here, we change it to inspect the signatures of the entire declaration. Attempting this without changing the checker used to a non-diagnostics-producing checker caused issues elsewhere, but this change fixed those issues.FunctionExpressionthat is fixable is the direct child of aVariableDeclaration, then it reports a diagnostic on the variable name. However, triggering the code fix on the variable name will not successfully perform the change. This PR specifically handles this scenario when performing the code fix.FunctionExpressions, as well asFunctionLikeDeclarations without a return type annotation.