azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-9666 Inner classes do not appear in type completion

Browse Source 
#KT-9666
This commit is contained in:
Valentin Kipyatkov
2015-10-20 15:10:52 +03:00
parent 375ecb4026
commit 255373162d
12 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
+16 -3
View File
@@ -75,11 +75,24 @@ class QualifierReceiver (
override var resultingDescriptor: DeclarationDescriptor by Delegates.notNull()
override val scope: KtScope get() {
val classObjectTypeScope = (classifier as? ClassDescriptor)?.classObjectType?.getMemberScope()?.let {
val scopes = ArrayList<KtScope>(4)
val classObjectTypeScope = (classifier as? ClassDescriptor)?.classObjectType?.memberScope?.let {
FilteringScope(it) { it !is ClassDescriptor }
}
val scopes = listOf(classObjectTypeScope, getNestedClassesAndPackageMembersScope()).filterNotNull().toTypedArray()
return ChainedScope(descriptor, "Member scope for " + name + " as package or class or object", *scopes)
scopes.addIfNotNull(classObjectTypeScope)
scopes.addIfNotNull(packageView?.memberScope)
if (classifier is ClassDescriptor) {
scopes.add(classifier.staticScope)
if (classifier.kind != ClassKind.ENUM_ENTRY) {
scopes.add(classifier.unsubstitutedInnerClassesScope)
}
}
return ChainedScope(descriptor, "Member scope for $name as package or class or object", *scopes.toTypedArray())
}
fun getClassObjectReceiver(): ReceiverValue =