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

Do not add subpackages that are not found

Browse Source
This commit is contained in:
Andrey Breslav
2013-12-24 15:14:04 +04:00
parent 9d6d071cfb
commit 2daf6961b2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java
+2 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.lang.descriptors.impl; package org.jetbrains.jet.lang.descriptors.impl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
@@ -131,7 +132,7 @@ public class PackageViewDescriptorImpl extends DeclarationDescriptorImpl impleme
public Collection<DeclarationDescriptor> getAllDescriptors() { public Collection<DeclarationDescriptor> getAllDescriptors() {
List<DeclarationDescriptor> result = Lists.newArrayList(); List<DeclarationDescriptor> result = Lists.newArrayList();
for (FqName subFqName : module.getPackageFragmentProvider().getSubPackagesOf(fqName)) { for (FqName subFqName : module.getPackageFragmentProvider().getSubPackagesOf(fqName)) {
result.add(getPackage(subFqName.shortName())); ContainerUtil.addIfNotNull(result, getPackage(subFqName.shortName()));
} }
return result; return result;
} }