From ffe231ec4deb9ef1054799e35a7f4a37c3b32a31 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 28 Nov 2014 12:44:04 +0300
Subject: [PATCH] JetType.getTypeArguments() may not contain null's

---
 .../jet/plugin/completion/smart/TypeInstantiationItems.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
index 4c0dd3e4dde..1aa6420d3b4 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt
@@ -129,7 +129,7 @@ class TypeInstantiationItems(
 
     private fun createTypeInstantiationItem(
             classifier: ClassDescriptor,
-            typeArgs: List<TypeProjection?>,
+            typeArgs: List<TypeProjection>,
             tail: Tail?
     ): LookupElement? {
         var lookupElement = LookupElementFactory.DEFAULT.createLookupElement(classifier, resolutionFacade, bindingContext)
@@ -152,7 +152,7 @@ class TypeInstantiationItems(
         var allLookupStrings = setOf(lookupString)
 
         // 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 signatureText: String? = null
@@ -269,7 +269,7 @@ class TypeInstantiationItems(
     private inner class InheritanceSearcher(
             val psiClass: PsiClass,
             val classDescriptor: ClassDescriptor,
-            val typeArgs: List<TypeProjection?>,
+            val typeArgs: List<TypeProjection>,
             val tail: Tail?) : InheritanceItemsSearcher {
 
         private val typeConstructor = classDescriptor.getTypeConstructor()