From 959161ec647ba0eee50b4b825a5a7304b066de8f Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 13 Mar 2014 13:55:27 +0400 Subject: [PATCH] test fixed --- .../intellij/psi/impl/source/PsiClassImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java index d7ba848980de..f66f41932145 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java @@ -500,13 +500,15 @@ public class PsiClassImpl extends JavaStubPsiElement> implements final NameHint nameHint = processor.getHint(NameHint.KEY); final ElementClassHint classHint = processor.getHint(ElementClassHint.KEY); String nameToSearch = nameHint == null ? null : nameHint.getName(state); - if (VALUES_METHOD.equals(nameToSearch) && + if ((nameToSearch == null || VALUES_METHOD.equals(nameToSearch)) && (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.METHOD))) { - if (!processor.execute(getValuesMethod(), ResolveState.initial())) return false; + PsiMethod method = getValuesMethod(); + if (method != null && !processor.execute(method, ResolveState.initial())) return false; } - if (VALUE_OF_METHOD.equals(nameToSearch) && + if ((nameToSearch == null || VALUE_OF_METHOD.equals(nameToSearch)) && (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.METHOD))) { - if (!processor.execute(getValueOfMethod(), ResolveState.initial())) return false; + PsiMethod method = getValueOfMethod(); + if (method != null && !processor.execute(method, ResolveState.initial())) return false; } } catch (IncorrectOperationException e) { @@ -679,9 +681,8 @@ public class PsiClassImpl extends JavaStubPsiElement> implements @Nullable public PsiQualifiedNamedElement getContainer() { final PsiFile file = getContainingFile(); - final PsiDirectory dir; - return file == null ? null : (dir = file.getContainingDirectory()) == null - ? null : JavaDirectoryService.getInstance().getPackage(dir); + final PsiDirectory dir = file.getContainingDirectory(); + return dir == null ? null : JavaDirectoryService.getInstance().getPackage(dir); } @Override