diff --git a/plugins/gradle/java/src/service/resolve/taskDeclaration.kt b/plugins/gradle/java/src/service/resolve/taskDeclaration.kt
index 9e3754fd4d52..160833c680c2 100644
--- a/plugins/gradle/java/src/service/resolve/taskDeclaration.kt
+++ b/plugins/gradle/java/src/service/resolve/taskDeclaration.kt
@@ -19,7 +19,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrRefere
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrLiteral
 import org.jetbrains.plugins.groovy.lang.psi.impl.signatures.GrClosureSignatureUtil.findCall
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil.createType
-import org.jetbrains.plugins.groovy.lang.psi.patterns.groovyMethodCall
+import org.jetbrains.plugins.groovy.lang.psi.patterns.groovyClosure
 import org.jetbrains.plugins.groovy.lang.psi.patterns.psiMethod
 import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil.unwrapClassType
 import org.jetbrains.plugins.groovy.lang.resolve.delegatesTo.DelegatesToInfo
@@ -45,12 +45,12 @@ class GradleTaskDeclarationTypeCalculator : GrTypeCalculator<GrReferenceExpressi
 class GradleTaskDeclarationClosureDelegateProvider : GrDelegatesToProvider {
 
   companion object {
-    private val projectTaskMethod = groovyMethodCall.resolvesTo(psiMethod(GRADLE_API_PROJECT, "task"))
+    private val projectTaskMethod = groovyClosure().inMethod(psiMethod(GRADLE_API_PROJECT, "task"))
   }
 
   override fun getDelegatesToInfo(expression: GrFunctionalExpression): DelegatesToInfo? {
     val methodCall = findCall(expression) ?: return null
-    if (isTaskIdCall(methodCall) || projectTaskMethod.accepts(methodCall)) {
+    if (isTaskIdCall(methodCall) || projectTaskMethod.accepts(expression)) {
       val taskType = getFromNamedArgument(methodCall) ?: createType(GRADLE_API_TASK, expression)
       return DelegatesToInfo(taskType, Closure.DELEGATE_FIRST)
     }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/patterns/GroovyMethodCallPattern.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/patterns/GroovyMethodCallPattern.kt
deleted file mode 100644
index 85db02fdb0fa..000000000000
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/patterns/GroovyMethodCallPattern.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.plugins.groovy.lang.psi.patterns
-
-import com.intellij.patterns.ElementPattern
-import com.intellij.patterns.PatternCondition
-import com.intellij.psi.PsiMethod
-import com.intellij.util.ProcessingContext
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethodCall
-
-class GroovyMethodCallPattern : GroovyExpressionPattern<GrMethodCall, GroovyMethodCallPattern>(GrMethodCall::class.java) {
-
-  fun resolvesTo(methodPattern: ElementPattern<out PsiMethod>): GroovyMethodCallPattern {
-    return with(object : PatternCondition<GrMethodCall>("resolves to method") {
-      override fun accepts(t: GrMethodCall, context: ProcessingContext?): Boolean {
-        val result = t.advancedResolve().element as? PsiMethod ?: return false
-        return methodPattern.accepts(result, context)
-      }
-    })
-  }
-}
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/patterns/groovyPatterns.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/patterns/groovyPatterns.kt
index 33bde1cb8508..d0097b2d4066 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/patterns/groovyPatterns.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/patterns/groovyPatterns.kt
@@ -43,7 +43,7 @@ fun PsiMethodPattern.withKind(kind: Any): PsiMethodPattern {
 }
 
 fun groovyClosure(): GroovyClosurePattern = GroovyClosurePattern()
-val groovyMethodCall: GroovyMethodCallPattern = GroovyMethodCallPattern()
+
 val groovyAnnotationArgumentValue: GroovyElementPattern.Capture<GrAnnotationMemberValue> = groovyElement()
 val groovyAnnotationArgument: GroovyAnnotationArgumentPattern.Capture = GroovyAnnotationArgumentPattern.Capture()
 val groovyAnnotationArgumentList: GroovyElementPattern.Capture<GrAnnotationArgumentList> = groovyElement()