fix: no variable suggestions without semicolon #54656
Merged
Conversation
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
typescript-bot
added
the
For Uncommitted Bug
|
I'm not sure, probably const a = 1
/**/ |
typescript-bot
added
For Backlog Bug
|
@typescript-bot pack this |
|
Heya @DanielRosenwasser, I've started to run the diff-based top-repos suite (tsserver) on this PR at 862807b. You can monitor the build here. Update: The results are in! |
|
Heya @DanielRosenwasser, I've started to run the tarball bundle task on this PR at 862807b. You can monitor the build here. |
|
Heya @DanielRosenwasser, I've started to run the diff-based user code test suite (tsserver) on this PR at 862807b. You can monitor the build here. Update: The results are in! |
|
Hey @DanielRosenwasser, I've packed this into an installable tgz. You can install it for testing by referencing it in your and then running There is also a playground for this build and an npm module you can use via |
|
@DanielRosenwasser Here are the results of running the user test suite comparing Everything looks good! |
gabritto
approved these changes
Jun 22, 2023
| @@ -5516,14 +5516,18 @@ function isModuleSpecifierMissingOrEmpty(specifier: ModuleReference | Expression | |||
| return !tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)?.text; | |||
| } | |||
|
|
|||
| function getVariableOrParameterDeclaration(contextToken: Node | undefined) { | |||
| function getVariableOrParameterDeclaration(contextToken: Node | undefined, location: Node) { | |||
| if (!contextToken) return; | |||
There was a problem hiding this comment.
Should we still return early if contextToken is undefined? Can we have a valid case where contextToken is undefined but location is defined?
There was a problem hiding this comment.
Actually I didn't think about it when I opened this PR. Though for me its obvious that it can be undefined only when there is no tokens behind the requesting position at all (as essentially contextToken is previousToken). Otherwise it will be something like OpenBraceToken.
MariaSolOs
reviewed
Jun 22, 2023
| if (!contextToken) return; | ||
|
|
||
| const declaration = findAncestor(contextToken, node => | ||
| const possiblyParameterDeclaration = findAncestor(contextToken, node => |
There was a problem hiding this comment.
I know that the existing code already uses findAncestor, but is this really needed @DanielRosenwasser? Can't we restrict the scope of this search?
There was a problem hiding this comment.
Do you mean do we really need two walks? I'm not sure; we could probably rewrite this to only do the second walk if the first fails though.
There was a problem hiding this comment.
Another way to do this is to check whether the contextToken ever becomes the location, and only then to start checking for variable declarations.
There was a problem hiding this comment.
Do you mean do we really need two walks? I'm not sure; we could probably rewrite this to only do the second walk if the first fails though.
I'm not sure I'm following initial request here. Why we can't have two walks here? (since it uses existing ast and we also do it only once per completionInfo request)
|
@DanielRosenwasser Here are the results of running the top-repos suite comparing Everything looks good! |
|
@typescript-bot perf test this |
|
Heya @DanielRosenwasser, I've started to run the perf test suite on this PR at 4c2bcc9. You can monitor the build here. Update: The results are in! |
|
@DanielRosenwasser Here they are:
CompilerComparison Report - main..54656
System
Hosts
Scenarios
TSServerComparison Report - main..54656
System
Hosts
Scenarios
StartupComparison Report - main..54656
System
Hosts
Scenarios
Developer Information: |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
@typescript-bot cherry-pick this to release-5.1 |
|
Heya @DanielRosenwasser, I've started to run the task to cherry-pick this into |
|
Hey @DanielRosenwasser, I've opened #54782 for you. |
typescript-bot
pushed a commit
to typescript-bot/TypeScript
that referenced
this pull request
Jun 26, 2023
DanielRosenwasser
pushed a commit
that referenced
this pull request
Jun 26, 2023
…e-5.1 (#54782) Co-authored-by: Vitaly Turovsky <vital2580@icloud.com>
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.
don't use contextToken for finding closest variable declaration
Fixes #54654
I think there could be a better fix (rather than using location and contextToken at the same time)