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

Consider packages equal if their fqNames are equal

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-30 15:27:31 +04:00
parent 9e446373e3
commit ef2ae0f398
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java
+5 -1
View File
@@ -133,7 +133,11 @@ public class JavaVisibilities {
private static boolean isInSameNamespace(@NotNull DeclarationDescriptor first, @NotNull DeclarationDescriptor second) { private static boolean isInSameNamespace(@NotNull DeclarationDescriptor first, @NotNull DeclarationDescriptor second) {
NamespaceDescriptor whatPackage = DescriptorUtils.getParentOfType(first, NamespaceDescriptor.class, false); NamespaceDescriptor whatPackage = DescriptorUtils.getParentOfType(first, NamespaceDescriptor.class, false);
NamespaceDescriptor fromPackage = DescriptorUtils.getParentOfType(second, NamespaceDescriptor.class, false); NamespaceDescriptor fromPackage = DescriptorUtils.getParentOfType(second, NamespaceDescriptor.class, false);
return fromPackage != null && whatPackage != null && whatPackage.equals(fromPackage); return fromPackage != null && whatPackage != null && fqNamesEqual(whatPackage, fromPackage);
}
private static boolean fqNamesEqual(@NotNull NamespaceDescriptor a, @NotNull NamespaceDescriptor b) {
return DescriptorUtils.getFQName(a).equals(DescriptorUtils.getFQName(b));
} }
@Nullable @Nullable