From cd1560e0b426984f65466ae9dc4cb71d537ec21d Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 26 Oct 2018 18:42:41 +0200
Subject: [PATCH] provide correct context for method return type

to fix generics in

class A<E> {
   fun foo(): E = null!!
}

public class B {
   public static void main(String[] args) {
       A<String> a = new A<>();
       a.foo().length(); // Unresolved length, because it thinks that `a.foo()` returns E
   }
}
---
 .../jetbrains/kotlin/asJava/classes/ultraLightPsi.kt | 12 ++++++------
 .../kotlin/asJava/classes/ultraLightUtils.kt         |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
index 222fbaeba2a..9882d48a9a8 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
@@ -63,7 +63,7 @@ class KtUltraLightClass(classOrObject: KtClassOrObject, private val support: Ult
 
     private fun allSuperTypes() =
         getDescriptor()?.typeConstructor?.supertypes?.mapNotNull {
-            it.asPsiType(classOrObject, support, TypeMappingMode.SUPER_TYPE) as? PsiClassType
+            it.asPsiType(classOrObject, support, TypeMappingMode.SUPER_TYPE, this) as? PsiClassType
         }.orEmpty()
 
     override fun createExtendsList(): PsiReferenceList? =
@@ -290,7 +290,7 @@ class KtUltraLightClass(classOrObject: KtClassOrObject, private val support: Ult
         }
         val returnType: PsiType? by lazyPub {
             if (isConstructor) null
-            else methodReturnType(f)
+            else methodReturnType(f, wrapper)
         }
         method.setMethodReturnType { returnType }
         return wrapper
@@ -303,14 +303,14 @@ class KtUltraLightClass(classOrObject: KtClassOrObject, private val support: Ult
         }
     }
 
-    private fun methodReturnType(f: KtDeclaration): PsiType {
+    private fun methodReturnType(f: KtDeclaration, wrapper: KtUltraLightMethod): PsiType {
         val desc = f.resolve()?.let { if (it is PropertyDescriptor) it.getter else it }
         val kotlinType = (desc as? FunctionDescriptor)?.returnType ?: return PsiType.NULL
         val mode = when {
             typeMapper(support).forceBoxedReturnType(desc) -> TypeMappingMode.RETURN_TYPE_BOXED
             else -> TypeMappingMode.getOptimalModeForReturnType(kotlinType, false)
         }
-        return kotlinType.asPsiType(f, support, mode)
+        return kotlinType.asPsiType(f, support, mode, wrapper)
     }
 
     private fun lightMethod(name: String, declaration: KtDeclaration, forceStatic: Boolean): LightMethodBuilder {
@@ -413,10 +413,10 @@ class KtUltraLightClass(classOrObject: KtClassOrObject, private val support: Ult
 
         if (needsAccessor(ktGetter)) {
             val getterName = mangleIfNeeded(listOfNotNull(ktGetter, declaration), JvmAbi.getterName(propertyName))
-            val getterType: PsiType by lazyPub { methodReturnType(declaration) }
             val getterPrototype = lightMethod(getterName, ktGetter ?: declaration, onlyJvmStatic)
-                .setMethodReturnType { getterType }
             val getterWrapper = KtUltraLightMethod(getterPrototype, declaration, support, this)
+            val getterType: PsiType by lazyPub { methodReturnType(declaration, getterWrapper) }
+            getterPrototype.setMethodReturnType { getterType }
             addReceiverParameter(declaration, getterWrapper)
             result.add(getterWrapper)
         }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt
index 89530a9bf65..28b8e51bc5c 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightUtils.kt
@@ -77,7 +77,7 @@ internal fun KotlinType.asPsiType(
     declaration: KtDeclaration,
     support: UltraLightSupport,
     mode: TypeMappingMode,
-    psiContext: PsiElement = declaration
+    psiContext: PsiElement
 ): PsiType {
     val typeFqName = constructor.declarationDescriptor?.fqNameSafe?.asString()
     if (typeFqName == "kotlin.Unit" && declaration is KtFunction) return PsiType.VOID