azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'private' package members should be visible for subpackages

Browse Source
This commit is contained in:
Svetlana Isakova
2012-04-04 18:55:17 +04:00
parent 9b04e85282
commit 0d462bf0bf
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
+2 -4
View File
@@ -48,9 +48,6 @@ public class Visibilities {
if (parent == fromParent) { if (parent == fromParent) {
return true; return true;
} }
if (fromParent instanceof NamespaceDescriptor) {
break; //'private' package members are not visible for subpackages, so when we reach a package, we should stop
}
fromParent = fromParent.getContainingDeclaration(); fromParent = fromParent.getContainingDeclaration();
} }
return false; return false;
@@ -77,7 +74,8 @@ public class Visibilities {
protected boolean isVisible(@NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { protected boolean isVisible(@NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
ModuleDescriptor parentModule = DescriptorUtils.getParentOfType(what, ModuleDescriptor.class, false); ModuleDescriptor parentModule = DescriptorUtils.getParentOfType(what, ModuleDescriptor.class, false);
ModuleDescriptor fromModule = DescriptorUtils.getParentOfType(from, ModuleDescriptor.class, false); ModuleDescriptor fromModule = DescriptorUtils.getParentOfType(from, ModuleDescriptor.class, false);
return parentModule == fromModule; assert parentModule != null && fromModule != null;
return parentModule.equals(fromModule);
} }
}; };
compiler/testData/diagnostics/tests/scopes/visibility2.jet
+1 -1
View File
@@ -13,7 +13,7 @@ private object PO {}
//FILE:b.kt //FILE:b.kt
//+JDK //+JDK
package a.b package b
import a.* import a.*