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

JetType.getTypeArguments() may not contain null's

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-28 12:44:04 +03:00
parent bf65ddaa2f
commit ffe231ec4d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
+3 -3
View File
@@ -129,7 +129,7 @@ class TypeInstantiationItems(
private fun createTypeInstantiationItem( private fun createTypeInstantiationItem(
classifier: ClassDescriptor, classifier: ClassDescriptor,
typeArgs: List<TypeProjection?>, typeArgs: List<TypeProjection>,
tail: Tail? tail: Tail?
): LookupElement? { ): LookupElement? {
var lookupElement = LookupElementFactory.DEFAULT.createLookupElement(classifier, resolutionFacade, bindingContext) var lookupElement = LookupElementFactory.DEFAULT.createLookupElement(classifier, resolutionFacade, bindingContext)
@@ -152,7 +152,7 @@ class TypeInstantiationItems(
var allLookupStrings = setOf(lookupString) var allLookupStrings = setOf(lookupString)
// drop "in" and "out" from type arguments - they cannot be used in constructor call // drop "in" and "out" from type arguments - they cannot be used in constructor call
val typeArgsToUse = typeArgs.map { if (it != null) TypeProjectionImpl(Variance.INVARIANT, it.getType()) else null } val typeArgsToUse = typeArgs.map { TypeProjectionImpl(Variance.INVARIANT, it.getType()) }
var itemText = lookupString + DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderTypeArguments(typeArgsToUse) var itemText = lookupString + DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderTypeArguments(typeArgsToUse)
var signatureText: String? = null var signatureText: String? = null
@@ -269,7 +269,7 @@ class TypeInstantiationItems(
private inner class InheritanceSearcher( private inner class InheritanceSearcher(
val psiClass: PsiClass, val psiClass: PsiClass,
val classDescriptor: ClassDescriptor, val classDescriptor: ClassDescriptor,
val typeArgs: List<TypeProjection?>, val typeArgs: List<TypeProjection>,
val tail: Tail?) : InheritanceItemsSearcher { val tail: Tail?) : InheritanceItemsSearcher {
private val typeConstructor = classDescriptor.getTypeConstructor() private val typeConstructor = classDescriptor.getTypeConstructor()