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

avoid invoking augmenters inside hasModifierProperty (IDEA-157105)

Browse Source
This commit is contained in:
peter
2016-06-06 18:02:02 +02:00
parent ab79aab017
commit eac22bca21
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java
+6 -2
View File
@@ -136,7 +136,9 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
if (!(grandParent instanceof PsiFile)) {
implicitModifiers.add(STATIC);
}
boolean hasSubClass = ContainerUtil.find(((PsiClass)parent).getFields(), new Condition<PsiField>() {
List<PsiField> fields = parent instanceof PsiExtensibleClass ? ((PsiExtensibleClass)parent).getOwnFields()
: Arrays.asList(((PsiClass)parent).getFields());
boolean hasSubClass = ContainerUtil.find(fields, new Condition<PsiField>() {
@Override
public boolean value(PsiField field) {
return field instanceof PsiEnumConstant && ((PsiEnumConstant)field).getInitializingClass() != null;
@@ -146,7 +148,9 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
implicitModifiers.add(FINAL);
}
for (PsiMethod method : ((PsiClass)parent).getMethods()) {
List<PsiMethod> methods = parent instanceof PsiExtensibleClass ? ((PsiExtensibleClass)parent).getOwnMethods()
: Arrays.asList(((PsiClass)parent).getMethods());
for (PsiMethod method : methods) {
if (method.hasModifierProperty(ABSTRACT)) {
implicitModifiers.add(ABSTRACT);
break;