From be35b620f90d8e582828dce3c250e16caf59ceb6 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 1 Jun 2010 09:30:54 +0100 Subject: [PATCH] fix tests broken by package classes caching --- .../src/com/intellij/psi/impl/file/PsiPackageImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java index bd7885956600..94422d944b9c 100644 --- a/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java @@ -497,7 +497,8 @@ public class PsiPackageImpl extends PsiElementBase implements PsiPackage, Querya NameHint nameHint = processor.getHint(NameHint.KEY); if (nameHint != null) { final String shortName = nameHint.getName(state); - if (containsClassNamed(shortName) && processClassesByName(processor, state, place, scope, shortName)) return false; + if ((migration != null || containsClassNamed(shortName)) + && processClassesByName(processor, state, place, scope, shortName)) return false; } else if (prefixMatcher != null && migration == null) { for (String className : getClassNamesCache()) {