From b93a3367711f69e6b6a84ea398817500e35cf65b Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 18 Feb 2015 13:59:43 +0100
Subject: [PATCH] groovy hasModifierProperty: don't resolve annotations unless
 really needed (EA-64982, EA-64979, EA-64978)

---
 .../psi/impl/auxiliary/modifiers/GrModifierListImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
index 6fa2c5e3f403..41d6f98ef711 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
@@ -189,10 +189,10 @@ public class GrModifierListImpl extends GrStubElementBase<GrModifierListStub> im
         if (modifier.equals(GrModifier.STATIC)) return true;
         if (modifier.equals(GrModifier.FINAL)) return true;
       }
-      if (pParent instanceof GrTypeDefinition) {
+      if (pParent instanceof GrTypeDefinition && modifier.equals(GrModifier.FINAL) && !modifierList.hasExplicitVisibilityModifiers()) {
         PsiModifierList pModifierList = ((GrTypeDefinition)pParent).getModifierList();
-        if (pModifierList != null && !modifierList.hasExplicitVisibilityModifiers() && PsiImplUtil.hasImmutableAnnotation(pModifierList)) {
-          if (modifier.equals(GrModifier.FINAL)) return true;
+        if (pModifierList != null && PsiImplUtil.hasImmutableAnnotation(pModifierList)) {
+          return true;
         }
       }
     }