From a6df94871eef824fa8b6e984517eeb3670fe5495 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 17 Sep 2012 13:39:49 +0400 Subject: [PATCH] rollback --- java/java-psi-api/src/com/intellij/psi/PsiPackage.java | 4 ---- .../src/com/intellij/psi/impl/file/PsiPackageImpl.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/PsiPackage.java b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java index a6680a60a4b5..97e9e653a828 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiPackage.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java @@ -110,9 +110,5 @@ public interface PsiPackage extends PsiCheckedRenameElement, NavigationItem, Psi @NonNls String getName(); - /** - * This method is intended to be used in dumb mode only. - * Most likely, it should be hidden in implementation. - */ boolean containsClassNamed(String name); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java index 7b72be2d0c71..b04b592b48af 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java @@ -210,7 +210,7 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya NameHint nameHint = processor.getHint(NameHint.KEY); if (nameHint != null) { final String shortName = nameHint.getName(state); - if (processClassesByName(processor, state, place, scope, shortName)) return false; + if (containsClassNamed(shortName) && processClassesByName(processor, state, place, scope, shortName)) return false; } else if (prefixMatcher != null) { for (String className : getClassNamesCache()) {