Don't create block on indentation with a single statement #2183
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
commented
Nov 30, 2020
| @@ -2087,42 +2087,55 @@ class ScalametaParser(input: Input, dialect: Dialect) { parser => | |||
| atPos(t, auto)(Term.Match(t, inBracesOrNil(caseClauses()))) | |||
| } | |||
| } | |||
|
|
|||
| def ifClause(isInline: Boolean = false) = { | |||
There was a problem hiding this comment.
This is moved out from expr
| // FIXME: when parsing `(2 + 3)`, do we want the ApplyInfix's position to include parentheses? | ||
| // if yes, then nothing has to change here | ||
| // if no, we need eschew autoPos here, because it forces those parentheses on the result of calling prefixExpr | ||
| // see https://github.com/scalameta/scalameta/issues/1083 and https://github.com/scalameta/scalameta/issues/1223 | ||
| def expr(location: Location, allowRepeated: Boolean): Term = | ||
| autoPos(token match { | ||
| case SkInline() if ahead(token.is[KwIf]) => |
There was a problem hiding this comment.
Turns out there was one more issue with ifs, so a much safer place to check it is here.
The problem was with
def a = inline if cond then a
| } | ||
| case KwIf() if mods.size > 0 => | ||
| syntaxError("If can only contain inline modifier", at = token.pos) | ||
| ifClause(isInline = true) |
There was a problem hiding this comment.
I removed the additional case with non-inline mods - it will be reported anyway as error.
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.
After working a bit on scalafmt it seems that most problematic is the case with a single statement, which now is sometimes be treated as an indented block. So reformatting could sometimes cause a new block to be created even if there was none before.