Fix qualified name construction for the case when IDEA distorts them (e.g. replaces all '$' by '.')
This commit is contained in:
+4
-3
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user