Allow nested end marker scopes at same indentation width #7571
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
liufengyun
approved these changes
Nov 19, 2019
There was a problem hiding this comment.
A minor comment, otherwise LGTM
The following code
def f[T](x: Option[T]) = x match
case Some(y) =>
case None => "hello"
end matchwill result in an unexpected error message:
4 | end match
| ^
|The start of this line does not match any of the previous indentation widths.
|Indentation width of current line : 2 spaces
|This falls between previous widths: 0 spaces and 2 spaces
1. Simplify the logic 2. Make end marker errors more reliable by recognizing end markers in more places 3. Allow nested end marker scopes at same indentation width Example in pos/end-nested.scala ```scala def f[T](x: Option[T]) = x match case Some(y) => case None => end f ``` Here, we should not give a "misaligned endmarker" error, which means we have to skip the nested `match` scope.
odersky
force-pushed
the
add-end-nested
branch
from
e19ad6a to
957fbde
Compare
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.
Example in pos/end-nested.scala
Here, we should not give a "misaligned endmarker" error, which means
we have to skip the nested
matchscope.