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

Do not search inheritors of Any

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-27 14:46:24 +03:00
parent 9af2877f97
commit c1252c7963
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
+8 -6
View File
@@ -97,13 +97,15 @@ class TypeInstantiationItems(
val typeArgs = type.getArguments() val typeArgs = type.getArguments()
items.addIfNotNull(createTypeInstantiationItem(classifier, typeArgs, tail)) items.addIfNotNull(createTypeInstantiationItem(classifier, typeArgs, tail))
inheritanceSearchers.addInheritorSearcher(classifier, classifier, typeArgs, tail) if (!KotlinBuiltIns.getInstance().isAny(classifier)) { // do not search inheritors of Any
inheritanceSearchers.addInheritorSearcher(classifier, classifier, typeArgs, tail)
val javaAnalogFqName = KotlinToJavaTypesMap.getInstance().getKotlinToJavaFqName(DescriptorUtils.getFqNameSafe(classifier)) val javaAnalogFqName = KotlinToJavaTypesMap.getInstance().getKotlinToJavaFqName(DescriptorUtils.getFqNameSafe(classifier))
if (javaAnalogFqName != null) { if (javaAnalogFqName != null) {
val javaAnalog = moduleDescriptor.resolveTopLevelClass(javaAnalogFqName) val javaAnalog = moduleDescriptor.resolveTopLevelClass(javaAnalogFqName)
if (javaAnalog != null) { if (javaAnalog != null) {
inheritanceSearchers.addInheritorSearcher(javaAnalog, classifier, typeArgs, tail) inheritanceSearchers.addInheritorSearcher(javaAnalog, classifier, typeArgs, tail)
}
} }
} }
} }
idea/testData/completion/smart/AnyExpected.kt
+2 -1
View File
@@ -6,4 +6,5 @@ val v: Any = <caret>
// ABSENT: ::foo // ABSENT: ::foo
// ABSENT: ::C // ABSENT: ::C
// ABSENT: ::Runnable // ABSENT: ::Runnable
// ABSENT: C