From 71ed2d2c71127535871f5e2b69f598e4ca84d0c3 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 31 Oct 2013 13:02:16 +0400 Subject: [PATCH] Do not fail when an allegedly present name is not resolved --- .../java/lazy/descriptors/LazyJavaMemberScope.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index 84800b41bf9..5208aa242b9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -279,12 +279,18 @@ public abstract class LazyJavaMemberScope( for (name in getAllPackageNames()) { val descriptor = getNamespace(name) - result.add(descriptor ?: throw IllegalStateException("Descriptor not found for name $name in " + getContainingDeclaration())) + if (descriptor != null) { + // Null signifies that a package found in Java is not present in Kotlin + result.add(descriptor) + } } for (name in getAllClassNames()) { val descriptor = getClassifier(name) - result.add(descriptor ?: throw IllegalStateException("Descriptor not found for name $name in " + getContainingDeclaration())) + if (descriptor != null) { + // Null signifies that a class found in Java is not present in Kotlin (e.g. package class) + result.add(descriptor) + } } for (name in getAllFunctionNames()) {