Internal visibility works the same as public

Fix test data
This change is needed to preserve old behaviour for M9
isFriend() utilities become unused after this change
This commit is contained in:
Pavel V. Talanov
2014-09-26 18:47:27 +04:00
parent cd0551078c
commit 54799b1a34
6 changed files with 23 additions and 22 deletions
@@ -75,8 +75,8 @@ public class Visibilities {
public static final Visibility INTERNAL = new Visibility("internal", false) {
@Override
protected boolean isVisible(@NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
DeclarationDescriptor fromOrModule = from instanceof PackageViewDescriptor ? ((PackageViewDescriptor) from).getModule() : from;
return isInFriendModule(what, fromOrModule);
//NOTE: supposedly temporarily
return PUBLIC.isVisible(what, from);
}
};
@@ -119,6 +119,7 @@ public class Visibilities {
return findInvisibleMember(what, from) == null;
}
@SuppressWarnings("UnusedDeclaration")
private static boolean isInFriendModule(@NotNull DeclarationDescriptor what, @NotNull DeclarationDescriptor from) {
return DescriptorUtils.getContainingModule(what).isFriend(DescriptorUtils.getContainingModule(from));
}