diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt index 1f0cbc8fd93..83706926a20 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -73,6 +73,8 @@ class LazyJavaClassDescriptor( private val _annotations = c.resolveAnnotations(jClass.getAnnotations()) override fun getAnnotations(): List = _annotations + override fun toString() = "lazy java class $fqName" + private inner class LazyJavaClassTypeConstructor : TypeConstructor { private val _parameters = c.storageManager.createLazyValue { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt index 2652c0cc0f0..c24367f0b43 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -271,4 +271,6 @@ public class LazyJavaClassMemberScope( // namespaces should be resolved elsewhere override fun getNamespace(name: Name): NamespaceDescriptor? = null override fun getAllPackageNames(): Collection = listOf() + + override fun toString() = "Lazy java member scope for " + jClass.getFqName() } \ No newline at end of file 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 b33deae3b5f..3cb2043dcfd 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 @@ -78,6 +78,8 @@ public abstract class LazyJavaMemberScope( protected abstract fun getAllFunctionNames(): Collection protected abstract fun addExtraDescriptors(result: MutableCollection) + override fun toString() = "Lazy scope for ${getContainingDeclaration()}" + TestOnly override fun printScopeStructure(p: Printer) { p.println(javaClass.getSimpleName(), " {") diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt index 0684c554914..a972c90566e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt @@ -22,6 +22,8 @@ abstract class LazyJavaPackageFragment( protected abstract val _memberScope: JetScope override fun getMemberScope() = _memberScope + + override fun toString() = "lazy java package fragment: " + getFqName() } public class LazyPackageFragmentForJavaPackage(