Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stabilize args of apply #8202

Merged
merged 2 commits into from Jul 22, 2019
Merged

Stabilize args of apply #8202

merged 2 commits into from Jul 22, 2019

Conversation

som-snytt
Copy link
Contributor

@som-snytt som-snytt commented Jul 3, 2019

@scala-jenkins scala-jenkins added this to the 2.13.1 milestone Jul 3, 2019
@SethTisue SethTisue added the release-notes worth highlighting in next release notes label Jul 3, 2019
@SethTisue SethTisue requested a review from milessabin July 3, 2019 17:53
@milessabin
Copy link
Contributor

Is the essence of the change here that instead of lifting the stabilisers out to the top level they're instead lifted only as far as necessary?

@som-snytt
Copy link
Contributor Author

som-snytt commented Jul 3, 2019

Yes, except "stabilizers." Probably I should have split the "refactor" into a separate commit. The difference is when it sees an Apply that applies to our tree. (My first intuition was to look for a Block, but there is no Block in this case; in fact, introducing a Block is the workaround.)

Edit: before I forget, it recurses for the "enclosing tree" test, which is special-cased for Apply, as described. Probably it would look better as test(tree) && !enclosingTest(enclosingTree) with two methods. I'll try that edit before my lunch break is over.

@som-snytt
Copy link
Contributor Author

I pushed the simpler diff. It's obvious now that the change is when testing the enclosing context. My previous attempt was due to late-night coding. I also aligned the arrows. Can't wait for scalafix.

@milessabin
Copy link
Contributor

While you're in the area ... this looks related: scala/bug#11609.

@lrytz
Copy link
Member

lrytz commented Jul 22, 2019

Thank you, @som-snytt!

@lrytz lrytz merged commit c128fef into scala:2.13.x Jul 22, 2019
@som-snytt som-snytt deleted the debug/11397 branch July 22, 2019 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes worth highlighting in next release notes
Projects
None yet
6 participants