From 85013de183b4f582b512d31c4aca9844268a971b Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Fri, 14 Oct 2016 19:10:28 +0300 Subject: [PATCH] [groovy] always return value from stub Otherwise AST will be loaded for any annotation when annotation actually declares requested value. --- .../lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java index 1c4a259cff95..b82f7dbce2c4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java @@ -134,10 +134,7 @@ public class GrAnnotationImpl extends GrStubElementBase implem final GrAnnotationStub stub = getStub(); if (stub != null) { final GrAnnotation stubbedPsi = stub.getPsiElement(); - final PsiAnnotationMemberValue value = PsiImplUtil.findDeclaredAttributeValue(stubbedPsi, attributeName); - if (value == null) { - return null; - } + return PsiImplUtil.findDeclaredAttributeValue(stubbedPsi, attributeName); } return PsiImplUtil.findDeclaredAttributeValue(this, attributeName); }