From 382b29edc812980d8e0b2b95586d55252fabf638 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 7 Nov 2013 18:18:58 +0400 Subject: [PATCH] Fix qualified name construction for the case when IDEA distorts them (e.g. replaces all '$' by '.') --- .../java/lazy/descriptors/LazyJavaClassMemberScope.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 96da1f80d2a..84896770107 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 @@ -34,8 +34,6 @@ import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils import org.jetbrains.jet.lang.resolve.java.structure.JavaMember import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.impl.EnumEntrySyntheticClassDescriptor -import org.jetbrains.jet.storage.get public class LazyJavaClassMemberScope( c: LazyJavaResolverContextWithTypes, @@ -154,7 +152,10 @@ public class LazyJavaClassMemberScope( if (jNestedClass == null) null else - LazyJavaClassDescriptor(c, getContainingDeclaration(), jNestedClass.getFqName()!!, jNestedClass) + LazyJavaClassDescriptor(c, + getContainingDeclaration(), + DescriptorUtils.getFQName(getContainingDeclaration()).child(name).toSafe(), + jNestedClass) } override fun getClassifier(name: Name): ClassifierDescriptor? = if (enumClassObject) null else nestedClasses(name)