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

Smart completion fixed filtering of non-suitable generic inheritors

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-27 20:15:00 +03:00
parent bf130676a8
commit 8bc7cf3d18
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
+3 -4
View File
@@ -298,11 +298,10 @@ class TypeInstantiationItems(
reconstructionResult.getResultingType() ?: continue reconstructionResult.getResultingType() ?: continue
} }
else { else {
val type = descriptor.getDefaultType() descriptor.getDefaultType()
// check if derived type matches type arguments for base
if (baseHasTypeArgs && !type.isSubtypeOf(expectedType)) continue
type
} }
// check if derived type matches type arguments for base
if (baseHasTypeArgs && !resultingType.isSubtypeOf(expectedType)) continue
val lookupElement = createTypeInstantiationItem(descriptor, resultingType.getArguments(), tail) ?: continue val lookupElement = createTypeInstantiationItem(descriptor, resultingType.getArguments(), tail) ?: continue
consumer(lookupElement.assignSmartCompletionPriority(SmartCompletionItemPriority.INHERITOR_INSTANTIATION)) consumer(lookupElement.assignSmartCompletionPriority(SmartCompletionItemPriority.INHERITOR_INSTANTIATION))