From ad2f02b12e0d5709319d18ba0682a60e8a68f8c0 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Fri, 30 Nov 2018 18:00:25 +0300
Subject: [PATCH] Minor. Get rid of redundant is check and unused method

Now, nullability for ultra-light elements is processed via KtUltraLightNullabilityAnnotation
---
 .../kotlin/asJava/classes/ultraLightMethod.kt | 22 -------------------
 .../asJava/elements/lightAnnotations.kt       |  5 -----
 2 files changed, 27 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt
index be96c49f492..d7690d5e6e7 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt
@@ -11,7 +11,6 @@ import com.intellij.psi.impl.PsiSuperMethodImplUtil
 import com.intellij.psi.impl.light.LightMethodBuilder
 import com.intellij.psi.impl.light.LightTypeParameterListBuilder
 import org.jetbrains.annotations.NonNls
-import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
 import org.jetbrains.kotlin.asJava.builder.LightMemberOriginForDeclaration
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.asJava.elements.KtLightMethodImpl
@@ -21,9 +20,7 @@ import org.jetbrains.kotlin.codegen.FunctionCodegen
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
-import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
 import org.jetbrains.kotlin.types.KotlinType
@@ -158,23 +155,4 @@ internal class KtUltraLightParameter(
         }
         return kotlinOrigin
     }
-
-    internal fun getTypeForNullability(): KotlinType? {
-        if (receiver != null) return kotlinType
-        if (kotlinOrigin is KtProperty) {
-            if (kotlinOrigin.setter?.hasModifier(KtTokens.PRIVATE_KEYWORD) == true) return null
-            return kotlinType
-        }
-        if (kotlinOrigin is KtParameter) {
-            val reference = kotlinOrigin.typeReference
-            if (kotlinOrigin.isVarArg && reference != null) {
-                LightClassGenerationSupport.getInstance(project).analyze(reference)[BindingContext.TYPE, reference]?.let { return it }
-            }
-            if (reference != null || kotlinOrigin.parent?.parent is KtPropertyAccessor) {
-                return kotlinType
-            }
-        }
-        return null
-    }
-
 }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
index 23272eb4ef1..5ac4b73e8cf 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
@@ -24,7 +24,6 @@ import org.jetbrains.annotations.NotNull
 import org.jetbrains.annotations.Nullable
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
-import org.jetbrains.kotlin.asJava.classes.KtUltraLightParameter
 import org.jetbrains.kotlin.asJava.classes.cannotModify
 import org.jetbrains.kotlin.asJava.classes.lazyPub
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
@@ -290,10 +289,6 @@ open class KtLightNullabilityAnnotation<D : KtLightElement<*, PsiModifierListOwn
     internal fun KtTypeReference.getType(): KotlinType? = analyze()[BindingContext.TYPE, this]
 
     private fun getTargetType(annotatedElement: PsiElement): KotlinType? {
-        if (member is KtUltraLightParameter) {
-            return member.getTypeForNullability()
-        }
-
         if (annotatedElement is KtTypeReference) {
             annotatedElement.getType()?.let { return it }
         }