From af616e731b069d62f478a5ef3ac749c17d2a3bce Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 23 Jul 2014 17:12:13 +0400 Subject: [PATCH] Fix DescriptorUtils#getContainingModule --- .../src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index 9843a2ebdb0..0fe292f2f0d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -153,6 +153,9 @@ public class DescriptorUtils { @NotNull public static ModuleDescriptor getContainingModule(@NotNull DeclarationDescriptor descriptor) { + if (descriptor instanceof PackageViewDescriptor) { + return ((PackageViewDescriptor) descriptor).getModule(); + } ModuleDescriptor module = getParentOfType(descriptor, ModuleDescriptor.class, false); assert module != null : "Descriptor without a containing module: " + descriptor; return module;