From 11b60f6604cb47fd9fbd39f3a359064b2775a45e Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 4 Feb 2015 13:08:46 +0300 Subject: [PATCH] Light Classes: Delegate getUseScope() to original elements #KT-6699 Fixed --- .../asJava/KotlinLightClassForExplicitDeclaration.java | 7 +++++++ .../org/jetbrains/kotlin/asJava/KotlinLightField.java | 2 +- .../jetbrains/kotlin/asJava/KotlinLightParameter.java | 9 +++++++++ .../kotlin/asJava/KotlinLightTypeParameter.java | 7 +++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java index 5d891eed70d..e67f0e31c2c 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -31,6 +31,7 @@ import com.intellij.psi.impl.java.stubs.PsiJavaFileStub; import com.intellij.psi.impl.light.LightClass; import com.intellij.psi.impl.light.LightMethod; import com.intellij.psi.scope.PsiScopeProcessor; +import com.intellij.psi.search.SearchScope; import com.intellij.psi.stubs.PsiClassHolderFileStub; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValuesManager; @@ -577,6 +578,12 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC ); } + @NotNull + @Override + public SearchScope getUseScope() { + return getOrigin().getUseScope(); + } + private static boolean checkSuperTypeByFQName(@NotNull ClassDescriptor classDescriptor, @NotNull String qualifiedName, Boolean deep) { if (CommonClassNames.JAVA_LANG_OBJECT.equals(qualifiedName)) return true; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java index f3becc8bb25..20719d6b811 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java @@ -56,7 +56,7 @@ public abstract class KotlinLightField