[Scala 3]Keywords can also end indentation region if on the same line #2384
Conversation
This file contains 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
tgodzik
force-pushed
the
fix-then-same-line
branch
from
9f90f2b to
968a3e3
Compare
dos65
reviewed
Jun 16, 2021
| @@ -358,7 +358,8 @@ class ScalametaParser(input: Input)(implicit dialect: Dialect) { parser => | |||
| token.is[KwDo] || token.is[KwCatch] || token.is[KwFinally] || token.is[KwYield] || | |||
| token.is[KwMatch] | |||
|
|
|||
| if (existingIndent == expected && canEndIndentation(curr.token)) { | |||
| // we also insert outdent if correct keyword is on the same line | |||
| if ((existingIndent == expected || expected == -1) && canEndIndentation(curr.token)) { | |||
There was a problem hiding this comment.
With this additional rule, it seems that calling countIndentAndNewline isn't necessary at all.
It would be enough just to check that we are inside the indented region and keyword can close it.
Smth like:
sepRegions match {
case region :: tail if region.isIndented && canEndIndetation(curr.token) =>
// procude outdent
true
case _ => false
}There was a problem hiding this comment.
Ach, you are right. This actually works in more situations that it didn't previously work like:
val a = if false then
1
2
else
3
This follows the additional rules in https://dotty.epfl.ch/docs/reference/other-new-features/indentation.html ``` The following two additional rules support parsing of legacy code with ad-hoc layout. They might be withdrawn in future language versions: An <outdent> is also inserted if the next token following a statement sequence starting with an <indent> closes an indentation region, i.e. is one of then, else, do, catch, finally, yield, }, ), ] or case. ``` Fixes scalameta#2379
tgodzik
force-pushed
the
fix-then-same-line
branch
from
968a3e3 to
b518235
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.
This follows the additional rules in https://dotty.epfl.ch/docs/reference/other-new-features/indentation.html
Fixes #2379