MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

rollback

Browse Source
This commit is contained in:
Eugene Vigdorchik
2006-04-28 12:00:20 +04:00
parent 33875925fa
commit dc4dcb92a9
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
openapi/src/com/intellij/psi/util/PsiUtil.java
View File

@@ -1035,31 +1035,14 @@ public final class PsiUtil {
myNextObtained = true;
return;
}
if (myCurrentOwner.hasModifierProperty(PsiModifier.STATIC)) {
if (myCurrentOwner.hasModifierProperty(PsiModifier.STATIC) || myCurrentOwner.getContainingClass() == null) {
myNext = null;
myNextObtained = true;
return;
}
final PsiClass containingClass = myCurrentOwner.getContainingClass();
if (containingClass == null) {
final PsiTypeParameterListOwner owner = PsiTreeUtil.getContextOfType(myCurrentOwner, PsiTypeParameterListOwner.class, true);
if (owner != null) {
myCurrentOwner = owner;
obtainCurrentParams(myCurrentOwner);
nextElement();
}
else {
myNext = null;
myNextObtained = true;
return;
}
}
else {
myCurrentOwner = containingClass;
obtainCurrentParams(myCurrentOwner);
nextElement();
}
myCurrentOwner = myCurrentOwner.getContainingClass();
obtainCurrentParams(myCurrentOwner);
nextElement();
}
}