From 2daf6961b2001e0229113f0739a66cc9930cb845 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 24 Dec 2013 15:14:04 +0400 Subject: [PATCH] Do not add subpackages that are not found --- .../jet/lang/descriptors/impl/PackageViewDescriptorImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java index 64a37fce00e..0a022a9b6cd 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.lang.descriptors.impl; import com.google.common.collect.Lists; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; @@ -131,7 +132,7 @@ public class PackageViewDescriptorImpl extends DeclarationDescriptorImpl impleme public Collection getAllDescriptors() { List result = Lists.newArrayList(); for (FqName subFqName : module.getPackageFragmentProvider().getSubPackagesOf(fqName)) { - result.add(getPackage(subFqName.shortName())); + ContainerUtil.addIfNotNull(result, getPackage(subFqName.shortName())); } return result; }