Allow Optional Braces Around Template Bodies anyway #3096
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
kitbellew
requested changes
Mar 11, 2023
Comment on lines
4184
to
4189
| if (nextIndented) | ||
| indentedOnOpen(templateStatSeq(enumCaseAllowed, secondaryConstructorAllowed)) | ||
| else if (!enumCaseAllowed && isEndMarkerIntro(tokenPos)) | ||
| if (!enumCaseAllowed && isEndMarkerIntro(tokenPos) && !nextIndented) | ||
| (selfEmpty(), Nil) | ||
| else | ||
| syntaxError("expected template body", token) | ||
| else | ||
| // https://docs.scala-lang.org/scala3/reference/other-new-features/indentation.html#optional-braces-around-template-bodies | ||
| // https://github.com/scalameta/scalameta/issues/3093 | ||
| indentedOnOpen(templateStatSeq(enumCaseAllowed, secondaryConstructorAllowed)) |
There was a problem hiding this comment.
indentedOnOpen may be called only if it's definitely known that the current token is Indentation.Indent, and in this case it isn't.
I'd change to this:
if (enumCaseAllowed)
in.observeIndentedEnum()
else
in.observeIndented()
if (acceptOpt[Indentation.Indent])
indentedAfterOpen(templateStatSeq(enumCaseAllowed, secondaryConstructorAllowed))
and the rest could remain unchanged (else if (!enumCaseAllowed...).
There was a problem hiding this comment.
Thanks! that makes sense 👍
tanishiking
force-pushed
the
3093-allow-indent-for-template-body-colon
branch
2 times, most recently
from
95d9c98
to
4b52d3d
Compare
tanishiking
force-pushed
the
3093-allow-indent-for-template-body-colon
branch
from
4b52d3d
to
473677d
Compare
kitbellew
approved these changes
Mar 14, 2023
| @@ -4181,8 +4181,8 @@ class ScalametaParser(input: Input)(implicit dialect: Dialect) { parser => | |||
| else | |||
| in.observeIndented() | |||
|
|
|||
| if (nextIndented) | |||
There was a problem hiding this comment.
the nextIndented variable is no longer used.
There was a problem hiding this comment.
Oops, right, thanks!
fix scalameta#3093 previously, scalameta didn't accept the significant indent on anonymous class if it's enclosed by the block with braces. ```scala if (x) { new C: def foo = ??? } ``` Now scalameta accepts the significant indent with `:`.
tanishiking
force-pushed
the
3093-allow-indent-for-template-body-colon
branch
from
473677d
to
8108fb0
Compare
kitbellew
approved these changes
Mar 14, 2023
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.
fix #3093
It seems like we should accept the optional braces around template body when we accept
:, even inside the block with braces.I'm trying to confirm this is valid change from syntax specification https://docs.scala-lang.org/scala3/reference/other-new-features/indentation.html (that's why it's still draft)...