Issue/34870 #35586
Merged
Issue/34870 #35586
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
weswigham
requested changes
Dec 9, 2019
src/compiler/parser.ts
Outdated
Comment on lines
5065
to
5074
| if (token() !== SyntaxKind.CloseBraceToken) { | ||
| const lastError = lastOrUndefined(parseDiagnostics); | ||
| const start = scanner.getTokenPos(); | ||
| if (!lastError || start !== lastError.start) { | ||
| parseErrorAt(openBracePosition, openBracePosition + 1, Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here); | ||
| } | ||
| } | ||
| else { | ||
| parseExpected(SyntaxKind.CloseBraceToken) | ||
| } |
There was a problem hiding this comment.
Rather than this, since we want a related span (not a change to the original span), consider:
if (!parseExpected(SyntaxKind.CloseBraceToken)) {
const lastError = lastOrUndefined(parseDiagnostics)!;
addRelatedInfo(lastError, createFileDiagnostic(sourceFile, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here));
}There was a problem hiding this comment.
Thanks for the quick response. I've introduced the requested changes and fixed the linting errors.
weswigham
approved these changes
Dec 9, 2019
There was a problem hiding this comment.
Love it - cc @DanielRosenwasser for a review of the copy - once you're satisfied, give it a merge.
|
I love it too - thanks for the PR! |
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 #34870