Issue/34870#35586
Merged
DanielRosenwasser merged 3 commits intomicrosoft:masterfrom Dec 10, 2019
marcin-serwin:issue/34870
Merged
Issue/34870#35586DanielRosenwasser merged 3 commits intomicrosoft:masterfrom marcin-serwin:issue/34870
DanielRosenwasser merged 3 commits intomicrosoft:masterfrom
marcin-serwin:issue/34870
Conversation
weswigham
requested changes
Dec 9, 2019
Member
weswigham
left a comment
weswigham
left a comment
There was a problem hiding this comment.
If you could also undo the unrelated whitespace changes, that'd be swell.
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) | ||
| } |
Member
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));
}
Contributor
Author
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
Member
weswigham
left a comment
weswigham
left a comment
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.
Member
|
I love it too - thanks for the PR! |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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