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

Minor: improve DescriptorUtils#getContainingModule()

Browse Source 
Correctly handle the case when descriptor is a child of PackageViewDescriptor
This commit is contained in:
Pavel V. Talanov
2015-04-28 12:35:05 +03:00
parent ac2cb9af74
commit 17c3bf6502
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+8 -3
View File
@@ -191,10 +191,15 @@ public class DescriptorUtils {
@Nullable @Nullable
public static ModuleDescriptor getContainingModuleOrNull(@NotNull DeclarationDescriptor descriptor) { public static ModuleDescriptor getContainingModuleOrNull(@NotNull DeclarationDescriptor descriptor) {
if (descriptor instanceof PackageViewDescriptor) { ModuleDescriptor moduleDescriptor = getParentOfType(descriptor, ModuleDescriptor.class, false);
return ((PackageViewDescriptor) descriptor).getModule(); if (moduleDescriptor != null) {
return moduleDescriptor;
} }
return getParentOfType(descriptor, ModuleDescriptor.class, false); PackageViewDescriptor packageViewDescriptor = getParentOfType(descriptor, PackageViewDescriptor.class, false);
if (packageViewDescriptor != null) {
return packageViewDescriptor.getModule();
}
return null;
} }
@Nullable @Nullable