From 482406b0d92379dfe11a390c2783b32f42da2bd8 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 20 Aug 2015 18:11:41 +0200
Subject: [PATCH] remove descriptor field from LightClassDataForKotlinClass

---
 .../jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java | 6 ++----
 .../kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt | 5 -----
 .../org/jetbrains/kotlin/asJava/LightClassStubWithData.kt   | 6 +-----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
index 6f7e2d35c0a..150582d87fd 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
@@ -177,7 +177,7 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
                         if (classDescriptor == null) {
                             return new OutermostKotlinClassLightClassData(
                                     javaFileStub, extraDiagnostics, FqName.ROOT, classOrObject,
-                                    null, Collections.<JetClassOrObject, InnerKotlinClassLightClassData>emptyMap()
+                                    Collections.<JetClassOrObject, InnerKotlinClassLightClassData>emptyMap()
                             );
                         }
 
@@ -192,8 +192,7 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
 
                             InnerKotlinClassLightClassData innerLightClassData = new InnerKotlinClassLightClassData(
                                     predictClassFqName(bindingContext, innerClassDescriptor),
-                                    innerClass,
-                                    innerClassDescriptor
+                                    innerClass
                             );
 
                             innerClassesMap.put(innerClass, innerLightClassData);
@@ -204,7 +203,6 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
                                 extraDiagnostics,
                                 fqName,
                                 classOrObject,
-                                classDescriptor,
                                 innerClassesMap
                         );
                     }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
index 34c400fd38f..ef18b502cc9 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
@@ -151,11 +151,6 @@ public open class KotlinLightClassForExplicitDeclaration(
     private fun getJavaFileStub(): PsiJavaFileStub = getLightClassData().javaFileStub
 
     protected fun getDescriptor(): ClassDescriptor? {
-        val cachedValue = getLightClassCachedValue(classOrObject)
-        if (cachedValue.hasUpToDateValue()) {
-            return cachedValue.value.dataForClass(classOrObject)?.descriptor
-        }
-
         return LightClassGenerationSupport.getInstance(project).resolveClassToDescriptor(classOrObject)
     }
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt
index 52eebe90bb9..27ac4ab039d 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.asJava
 
 import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.JetClassOrObject
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
@@ -31,7 +30,6 @@ interface WithFileStubAndExtraDiagnostics {
 
 interface LightClassDataForKotlinClass: LightClassData {
     val classOrObject: JetClassOrObject
-    val descriptor: ClassDescriptor?
     val jvmQualifiedName: FqName
 }
 
@@ -42,8 +40,7 @@ data class KotlinPackageLightClassData(
 
 data class InnerKotlinClassLightClassData(
         override val jvmQualifiedName: FqName,
-        override val classOrObject: JetClassOrObject,
-        override val descriptor: ClassDescriptor?
+        override val classOrObject: JetClassOrObject
 ): LightClassDataForKotlinClass
 
 data class OutermostKotlinClassLightClassData(
@@ -51,7 +48,6 @@ data class OutermostKotlinClassLightClassData(
         override val extraDiagnostics: Diagnostics,
         override val jvmQualifiedName: FqName,
         override val classOrObject: JetClassOrObject,
-        override val descriptor: ClassDescriptor?,
         val allInnerClasses: Map<JetClassOrObject, InnerKotlinClassLightClassData>
 ): LightClassDataForKotlinClass, WithFileStubAndExtraDiagnostics {