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

[gradle] get delegate for closure from method return type instead of invoked expression type

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2018-12-17 21:49:53 +03:00
parent 230f3e72da
commit 3e005b327f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/java/src/service/resolve/GradleMiscContributor.kt
+6 -4
View File
@@ -2,7 +2,10 @@
package org.jetbrains.plugins.gradle.service.resolve
import com.intellij.patterns.PsiJavaPatterns.psiElement
import com.intellij.psi.*
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import com.intellij.psi.ResolveState
import com.intellij.psi.scope.PsiScopeProcessor
import groovy.lang.Closure
import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames.*
@@ -68,9 +71,8 @@ class GradleMiscContributor : GradleMethodContextContributor {
// resolve closure type to delegate based on return method type, e.g.
// FlatDirectoryArtifactRepository flatDir(Closure configureClosure)
if (parent is GrMethodCall) {
val psiType = parent.invokedExpression.type
if (psiType != null && psiType != PsiType.VOID) {
return DelegatesToInfo(psiType, Closure.DELEGATE_FIRST)
parent.resolveMethod()?.returnType?.let { type ->
return DelegatesToInfo(type, Closure.DELEGATE_FIRST)
}
}
return null