Fix qualified name construction for the case when IDEA distorts them (e.g. replaces all '$' by '.')

This commit is contained in:
Andrey Breslav
2013-11-07 18:18:58 +04:00
parent b1c4665246
commit 382b29edc8
@@ -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)