From a96eaa2fa94854f7cdee44b610ffe80d16e9f366 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 18 Apr 2017 17:31:32 +0200
Subject: [PATCH] Remove incorrect @NotNull annotation on getIcon() (EA-79802)

---
 .../jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java  | 2 +-
 .../idea/completion/smart/MultipleArgumentsItemProvider.kt   | 5 +++--
 .../kotlin/idea/core/util/DescriptorMemberChooserObject.kt   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
index 578daf79c42..6b796ed4c79 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
@@ -36,7 +36,7 @@ public final class KotlinDescriptorIconProvider {
     private KotlinDescriptorIconProvider() {
     }
 
-    @NotNull
+    @Nullable
     public static Icon getIcon(@NotNull DeclarationDescriptor descriptor, @Nullable PsiElement declaration, @Iconable.IconFlags int flags) {
         if (declaration != null && !(declaration instanceof KtElement)) {
             return declaration.getIcon(flags);
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt
index e58071da1f0..ee121219d03 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt
@@ -23,6 +23,7 @@ import com.intellij.ui.LayeredIcon
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
+import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.completion.tryGetOffset
 import org.jetbrains.kotlin.idea.core.ArgumentPositionData
 import org.jetbrains.kotlin.idea.core.ExpectedInfo
@@ -82,8 +83,8 @@ class MultipleArgumentsItemProvider(
 
     private fun createParametersLookupElement(variables: List<VariableDescriptor>, tail: Tail): LookupElement {
         val compoundIcon = LayeredIcon(2)
-        val firstIcon = KotlinDescriptorIconProvider.getIcon(variables.first(), null, 0)
-        val lastIcon = KotlinDescriptorIconProvider.getIcon(variables.last(), null, 0)
+        val firstIcon = KotlinDescriptorIconProvider.getIcon(variables.first(), null, 0) ?: KotlinIcons.PARAMETER
+        val lastIcon = KotlinDescriptorIconProvider.getIcon(variables.last(), null, 0) ?: KotlinIcons.PARAMETER
         compoundIcon.setIcon(lastIcon, 0, 2 * firstIcon.iconWidth / 5, 0)
         compoundIcon.setIcon(firstIcon, 1, 0, 0)
 
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
index 0f6f0c102c4..0926ed3101e 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
@@ -31,8 +31,8 @@ import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
-import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
+import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.renderer.render
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
 import javax.swing.Icon
@@ -80,7 +80,7 @@ open class DescriptorMemberChooserObject(
                 MEMBER_RENDERER.render(descriptor)
         }
 
-        fun getIcon(declaration: PsiElement?, descriptor: DeclarationDescriptor): Icon {
+        fun getIcon(declaration: PsiElement?, descriptor: DeclarationDescriptor): Icon? {
             if (declaration != null && declaration.isValid) {
                 val isClass = declaration is PsiClass || declaration is KtClass
                 val flags = if (isClass) 0 else Iconable.ICON_FLAG_VISIBILITY