From: Dmitry Avdeev Date: Thu, 11 Mar 2010 07:20:55 +0000 (+0300) Subject: http://ea.jetbrains.com/browser/ea_problems/17270 : java class references suppressed... X-Git-Tag: 94.536~18 X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=33cd231fb140d37a2d8df119dca1517f7259a014;ds=sidebyside ea.jetbrains.com/browser/ea_problems/17270 : java class references suppressed in EL --- diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java index 601012827e5c..f73bb3e6b03b 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java @@ -23,7 +23,6 @@ import com.intellij.psi.PsiPackage; import com.intellij.psi.PsiReference; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.templateLanguages.OuterLanguageElement; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlTag; import org.jetbrains.annotations.NotNull; @@ -53,8 +52,13 @@ public class JavaClassListReferenceProvider extends JavaClassReferenceProvider { return PsiReference.EMPTY_ARRAY; } - if (position != null && PsiTreeUtil.getChildOfType(position, OuterLanguageElement.class) != null) { - return PsiReference.EMPTY_ARRAY; + if (position != null) { + int offset = position.getTextRange().getStartOffset() + offsetInPosition; + for(PsiElement child = position.getFirstChild(); child != null; child = child.getNextSibling()){ + if (child instanceof OuterLanguageElement && child.getTextRange().contains(offset)) { + return PsiReference.EMPTY_ARRAY; + } + } } NotNullLazyValue> topLevelPackages = new NotNullLazyValue>() {