sourcepath: Handle end markers in outline parsing #7717
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
We were not testing some files previously, and one of the file did not actually typecheck.
Previously, outline parsing would have failed on indent1.scala with: 7 | end inner | ^ | misaligned end marker because `OutlineParserCommon#skipBraces` does not update `in.openEndMarkers`, but calls `in.nextToken` which eventually calls `in.skipEndMarker` which checks that end markers are aligned. This commit fixes this by adding a boolean in the scanner to turn off end marker checks, this is used by the outline parser when skipping over code.
smarter
force-pushed
the
sourcepath-end-marker
branch
from
916eb5b to
8e57890
Compare
odersky
approved these changes
Dec 11, 2019
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.
Previously, outline parsing would have failed on indent1.scala with:
because
OutlineParserCommon#skipBracesdoes not updatein.openEndMarkers, but callsin.nextTokenwhich eventually callsin.skipEndMarkerwhich checks that end markers are aligned.This commit fixes this by adding a boolean in the scanner to turn off
end marker checks, this is used by the outline parser when skipping over
code.