From d5e776367fd4e063e64acd7343fb261cc924b05a Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Tue, 22 Mar 2011 13:53:54 +0300
Subject: [PATCH] Fix Grails Tests.

---
 .../plugins/groovy/lang/psi/patterns/GroovyPatterns.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/patterns/GroovyPatterns.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/patterns/GroovyPatterns.java
index d4b3c8c10eca..59f7ce94c863 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/patterns/GroovyPatterns.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/patterns/GroovyPatterns.java
@@ -102,7 +102,7 @@ public class GroovyPatterns extends PsiJavaPatterns {
     return stringLiteral().withParent(psiElement(GrNamedArgument.class));
   }
 
-  public static GroovyElementPattern.Capture<GrArgumentLabel> namedArgumentLabel() {
+  public static GroovyElementPattern.Capture<GrArgumentLabel> namedArgumentLabel(@Nullable final ElementPattern<? extends String> namePattern) {
     return new GroovyElementPattern.Capture<GrArgumentLabel>(new InitialPatternCondition<GrArgumentLabel>(GrArgumentLabel.class) {
       public boolean accepts(@Nullable final Object o, final ProcessingContext context) {
         if (o instanceof GrArgumentLabel) {
@@ -111,7 +111,7 @@ public class GroovyPatterns extends PsiJavaPatterns {
             IElementType elementType = ((LeafPsiElement)nameElement).getElementType();
             if (elementType == GroovyElementTypes.mIDENT ||
                 CommonClassNames.JAVA_LANG_STRING.equals(TypesUtil.getPsiTypeName(elementType))) {
-              return true;
+              return namePattern == null || namePattern.accepts(((GrArgumentLabel)o).getName());
             }
           }
         }
@@ -149,7 +149,7 @@ public class GroovyPatterns extends PsiJavaPatterns {
 
         if (!(eMethodCall instanceof GrCall)) return false;
 
-        return methodCall == null || methodCall.accepts(eMethodCall);
+        return methodCall == null || methodCall.accepts(eMethodCall, context);
       }
     });
   }