diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt index 074d4964d13..247a9e36950 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.java.jetAsJava import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.psi.JetDeclaration -public trait KotlinLightElement { +public trait KotlinLightElement { public val origin: T? public val delegate: D } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java index 4fc28096706..360673129ab 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java @@ -83,4 +83,9 @@ public class FakeLightClassForFileOfPackage extends AbstractLightClass implement public PsiElement copy() { return new FakeLightClassForFileOfPackage(getManager(), delegate, file); } + + @Override + public String getText() { + return null; + } } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt index 24e7aae6d98..ad76482f254 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt @@ -17,11 +17,10 @@ package org.jetbrains.jet.asJava; import com.intellij.psi.PsiClass; -import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement import org.jetbrains.jet.lang.psi.JetClassOrObject -public trait KotlinLightClass: PsiClass, KotlinLightElement { +public trait KotlinLightClass : PsiClass, KotlinLightElement { val fqName: FqName } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java index 44b7c2aac39..06b4f8391dd 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java @@ -24,13 +24,14 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.impl.PsiClassImplUtil; import com.intellij.psi.impl.light.AbstractLightClass; import com.intellij.psi.impl.light.LightField; -import org.jetbrains.jet.asJava.light.KotlinLightField; import com.intellij.psi.impl.light.LightMethod; import com.intellij.psi.impl.source.ClassInnerStuffCache; import com.intellij.psi.impl.source.PsiExtensibleClass; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.asJava.light.KotlinLightField; +import org.jetbrains.jet.lang.psi.JetClassOrObject; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetProperty; @@ -132,4 +133,10 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem } }); } + + @Override + public String getText() { + JetClassOrObject origin = getOrigin(); + return origin == null ? null : origin.getText(); + } }