Fix #9529: Desugar ExtMethods in expression position #9553
Merged
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
smarter
reviewed
Aug 13, 2020
| @@ -1715,6 +1715,8 @@ object desugar { | |||
| case PatDef(mods, pats, tpt, rhs) => | |||
| val pats1 = if (tpt.isEmpty) pats else pats map (Typed(_, tpt)) | |||
| flatTree(pats1 map (makePatDef(tree, mods, _, rhs))) | |||
| case ext: ExtMethods => | |||
| Block(List(ext), Literal(Constant(())).withSpan(ext.span)) | |||
There was a problem hiding this comment.
If this can only happen in case of error, maybe the parser should be changed to not try to parse extension methods in such positions?
There was a problem hiding this comment.
Why would we special case extensions? Isn't it better to handle them the same as defs? I would expect that the following would befave similarly
def f1: Unit = { def g = 0 }
def f2: Unit = { extension (x: Int) def g = 0 }
There was a problem hiding this comment.
Also, same error should be emitted for
def f1: Int = { def g = 0 } // error: Found: Unit Required: Int
def f2: Int = { extension (x: Int) def g = 0 } // error: Found: Unit Required: IntThere was a problem hiding this comment.
Ah ok then is it possible to have a pos test for this change?
There was a problem hiding this comment.
Yes, ill add the test
There was a problem hiding this comment.
Added these tests
Desugar the extension method into a block with a Unit expression. Also set a missing position for the ExtMethods tree.
nicolasstucki
force-pushed
the
fix-#9529
branch
from
caf2756 to
1e14ba3
Compare
smarter
approved these changes
Aug 14, 2020
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.
Desugar the extension method into a block with a Unit expression.
Also set a missing position for the ExtMethods tree.