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: resolve closure type to delegate based on return method type

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-12-06 17:50:43 +03:00
parent 05744d1ffd
commit c5280f0411
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/resolve/GradleMiscContributor.kt
+12 -1
View File
@@ -18,12 +18,14 @@ package org.jetbrains.plugins.gradle.service.resolve
import com.intellij.patterns.PsiJavaPatterns.psiElement
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiType
import com.intellij.psi.ResolveState
import com.intellij.psi.scope.PsiScopeProcessor
import groovy.lang.Closure
import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames.*
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethodCall
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrMethodCallExpression
import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyPsiManager
import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil
@@ -65,8 +67,8 @@ class GradleMiscContributor : GradleMethodContextContributor {
// return DelegatesToInfo(TypesUtil.createType("org.gradle.api.publish.PublicationContainer", closure), Closure.DELEGATE_FIRST)
// }
val parent = closure.parent
if (domainCollectionWithTypeClosure.accepts(closure)) {
val parent = closure.parent
if (parent is GrMethodCallExpression) {
val psiElement = parent.argumentList.allArguments.singleOrNull()?.reference?.resolve()
if (psiElement is PsiClass) {
@@ -74,6 +76,15 @@ 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)
}
}
return null
}