azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: remove unused jvmInternalName from KotlinPackageLightClassData

Browse Source
This commit is contained in:
Nikolay Krasko
2013-12-27 21:31:08 +04:00
parent 45be6b081d
commit 9aac846798
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
private static String getJvmInternalName(JetClassOrObject classOrObject) { private static String getJvmInternalName(JetClassOrObject classOrObject) {
if (JetPsiUtil.isLocal(classOrObject)) { if (JetPsiUtil.isLocal(classOrObject)) {
LightClassData data = getLightClassDataExactly(classOrObject); LightClassDataForKotlinClass data = getLightClassDataExactly(classOrObject);
return data != null ? data.getJvmInternalName() : ""; return data != null ? data.getJvmInternalName() : "";
} }
return PsiCodegenPredictor.getPredefinedJvmInternalName(classOrObject); return PsiCodegenPredictor.getPredefinedJvmInternalName(classOrObject);
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt
+3 -6
View File
@@ -20,18 +20,15 @@ import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.psi.JetClassOrObject import org.jetbrains.jet.lang.psi.JetClassOrObject
trait LightClassData { trait LightClassData
val jvmInternalName: String
}
trait LightClassDataForKotlinClass: LightClassData { trait LightClassDataForKotlinClass: LightClassData {
val classOrObject: JetClassOrObject val classOrObject: JetClassOrObject
val descriptor: ClassDescriptor? val descriptor: ClassDescriptor?
val jvmInternalName: String
} }
object KotlinPackageLightClassData: LightClassData { object KotlinPackageLightClassData: LightClassData
override val jvmInternalName: String = ""
}
data class InnerKotlinClassLightClassData( data class InnerKotlinClassLightClassData(
override val jvmInternalName: String, override val jvmInternalName: String,