Only issue matching token errors on non-dupe locations #43460
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
Intead of unconditionally retrieving the last error and attaching a related span, `parseErrorAt` and friends now return the last error and return `false` when there is none. Also make one more place use parseExpectedMatchingBrackets that I missed last time.
typescript-bot
added
Author: Team
For Uncommitted Bug
|
@typescript-bot perf test this |
|
Heya @sandersn, I've started to run the perf test suite on this PR at c141447. You can monitor the build here. Update: The results are in! |
|
Re 2: it reads less strangely to use undefined, so I'm going to do that. |
|
@typescript-bot perf test this |
|
Heya @sandersn, I've started to run the perf test suite on this PR at 435c99d. You can monitor the build here. Update: The results are in! |
|
@sandersn Here they are:Comparison Report - master..43460
System
Hosts
Scenarios
Developer Information: |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
First perf run shows no difference |
src/compiler/parser.ts
Outdated
| return false; | ||
| if (token() === closeKind) { | ||
| nextToken(); | ||
| return true; |
There was a problem hiding this comment.
Looks like no part of the parser consumes the return value, so you can make this void-returning.
There was a problem hiding this comment.
Yeah, it looks like it was just matching the nearby boolean functions.
| @@ -39,7 +39,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts( | |||
| !!! error TS2322: Type 'string' is not assignable to type 'number'. | |||
| ~ | |||
| !!! error TS1005: ',' expected. | |||
| !!! related TS1007 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts:7:4: The parser expected to find a ']' to match the '[' token here. | |||
There was a problem hiding this comment.
Why'd we lose this one?
There was a problem hiding this comment.
Both , and ] were expected, but , got there first, so the ] error didn't get issued. With return value in hand, the code now skips issuing a [] related span on a , error.
There was a problem hiding this comment.
Can we create separate issue for reporting error like expected , or ] instead.
|
@sandersn Here they are:Comparison Report - master..43460
System
Hosts
Scenarios
Developer Information: |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
sheetalkamat
approved these changes
Mar 31, 2021
weswigham
approved these changes
Mar 31, 2021
|
Thank you! |
jessetrinity
added a commit
to jessetrinity/TypeScript
that referenced
this pull request
May 19, 2021
…soft#43460)" This reverts commit 76a2ae3.
jessetrinity
pushed a commit
to jessetrinity/TypeScript
that referenced
this pull request
May 20, 2021
* Revert "Only issue matching token errors on non-dupe locations (microsoft#43460)" This reverts commit 76a2ae3. * Revert "Adding Diagnostic message for missing ']' and ')' in Array literal and conditional statements (microsoft#40884)" This reverts commit 555ef73. * re-add clobbered merge lines
jessetrinity
added a commit
to jessetrinity/TypeScript
that referenced
this pull request
May 27, 2021
This reverts commit 5770434.
sandersn
added a commit
that referenced
this pull request
Mar 16, 2022
…brackets (#44158) * Revert "Revert #43460 and #40884 (#44175)" This reverts commit 5770434. * fix missing opening brace match error * refactor parseExpectedMatchingBrackets * use getNodePos * accept baselines * delete mistakenly added files * Revert getNodePos addition Co-authored-by: Nathan Shively-Sanders <[email protected]>
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.
Instead of unconditionally retrieving the last error and attaching a related span,
parseErrorAtand friends now return the last error andreturn
falsewhen there is none.Also make one more place use parseExpectedMatchingBrackets that I missed last time.
Previously open questions:
parseErrorAtand friends?Answers:
Fixes comment on #40884.