From 1772e453e5434344e887b9b8ad643baf1aa305b1 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 14 Mar 2014 17:27:38 +0400 Subject: [PATCH] Unwrap light elements before filtering out non-source search targets --- .../ideaExtensions/KotlinReferencesSearcher.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java index 72b309871d6..0d95527a404 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java @@ -24,6 +24,7 @@ import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.asJava.AsJavaPackage; import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; @@ -50,9 +51,12 @@ public class KotlinReferencesSearcher extends QueryExecutorBase consumer) { PsiElement element = queryParameters.getElementToSearch(); - if (!JetPluginUtil.isInSource(element) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) { - return; - } + + PsiElement unwrappedElement = AsJavaPackage.getUnwrapped(element); + if (unwrappedElement == null + || !JetPluginUtil.isInSource(unwrappedElement) + || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(unwrappedElement)) return; + if (element instanceof JetClassOrObject) { processJetClassOrObject((JetClassOrObject) element, queryParameters); }