Fix-#1723: Avoid private leaks on completion #1922
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
As scala#1723 demonstrates, doing this at PostTyper is too late.
smarter
reviewed
Feb 1, 2017
| @@ -343,6 +343,7 @@ object Checking { | |||
| fail(i"$sym cannot have the same name as ${cls.showLocated} -- class definitions cannot be overridden") | |||
| sym.setFlag(Private) // break the overriding relationship by making sym Private | |||
| } | |||
| avoidPrivateLeaks(sym, sym.pos) | |||
There was a problem hiding this comment.
So far, no method in Checking mutates anything, it would be nice to keep this pattern. I suggest doing what checkNonCyclic does and returning the potentially updated sym.info, i.e.:
if (!sym.is(SyntheticOrPrivate) && sym.owner.isClass)
checkNoPrivateLeaks(sym, sym.pos)
else
sym.infoThere was a problem hiding this comment.
So far, no method in Checking mutates anything
The line just above the avoidPrivateLeaks call is also a mutation (admittedly, only in the error case).
There was a problem hiding this comment.
I have now refactored. You were right, the new organization is more coherent.
avoidPrivateLeaks got moved from Checking to TypeAssigner, where it fits well besides the other avoid methods.
smarter
reviewed
Feb 1, 2017
| @@ -733,7 +733,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle | |||
| // no longer necessary. | |||
| goto(end) | |||
| setPos(start, tree) | |||
| Checking.avoidPrivateLeaks(sym, tree.pos) | |||
| ta.avoidPrivateLeaks(sym, tree.pos) | |||
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.
As #1723 demonstrates, doing this at PostTyper is too late.
Review by @smarter. How about having a look at #1644 soon in return?