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

optimize DescriptorUtils.getContainingModuleOrNull() by removing duplicate parent traversal and Class.isInstance() checks

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-06-01 22:03:36 +02:00
parent 252ddf4e2e
commit 22168aa026
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+8 -7
View File
@@ -191,13 +191,14 @@ public class DescriptorUtils {
@Nullable @Nullable
public static ModuleDescriptor getContainingModuleOrNull(@NotNull DeclarationDescriptor descriptor) { public static ModuleDescriptor getContainingModuleOrNull(@NotNull DeclarationDescriptor descriptor) {
ModuleDescriptor moduleDescriptor = getParentOfType(descriptor, ModuleDescriptor.class, false); while (descriptor != null) {
if (moduleDescriptor != null) { if (descriptor instanceof ModuleDescriptor) {
return moduleDescriptor; return (ModuleDescriptor) descriptor;
} }
PackageViewDescriptor packageViewDescriptor = getParentOfType(descriptor, PackageViewDescriptor.class, false); if (descriptor instanceof PackageViewDescriptor) {
if (packageViewDescriptor != null) { return ((PackageViewDescriptor) descriptor).getModule();
return packageViewDescriptor.getModule(); }
descriptor = descriptor.getContainingDeclaration();
} }
return null; return null;
} }