Allow observing an indent after conditional #22611
Merged
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
som-snytt
force-pushed
the
issue/22608-nl-in-parens
branch
2 times, most recently
from
e65b79e to
1564f74
Compare
|
Note to self: #19099 is infix indent. (PR from end of queue.) |
|
It would be nice to avoid |
odersky
approved these changes
Feb 18, 2025
| @@ -105,6 +105,9 @@ object Parsers { | |||
| private val InCase: Region => Region = Scanners.InCase(_) | |||
| private val InCond: Region => Region = Scanners.InParens(LPAREN, _) | |||
| private val InFor : Region => Region = Scanners.InBraces(_) | |||
| private val InBrk : Region => Region = | |||
There was a problem hiding this comment.
I don't know what InBrk is supposed to mean. Can we find a better name?
There was a problem hiding this comment.
Also, it would be good to point to the issue number to explain what this fixes.
Normally do not infer NEWLINE within parens, but special case old syntax for conditionals, so that it can observe indented syntax. The mechanism is to inject an Indented region when parsing a parenthesized condition which is within an InParens region, such as an arg list. The effect is not to advance past EOL after `(true)`.
som-snytt
force-pushed
the
issue/22608-nl-in-parens
branch
from
971dacf to
a19c14a
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.
Normally do not infer NEWLINE within parens,
but special case old syntax for conditionals,
so that it can observe indented syntax.
The mechanism is to inject an Indented region
when parsing a parenthesized condition which is
within an InParens region, such as an arg list.
The effect is not to advance past EOL after
(true).Fixes #22608