MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

test fixed

Browse Source
This commit is contained in:
Alexey Kudravtsev
2014-03-17 14:25:53 +04:00
parent 3a250971af
commit 959161ec64
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+8 -7
View File
@@ -500,13 +500,15 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> 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<PsiClassStub<?>> 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