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 domain objects within domain container closure as GrLightField to have such candidates with less priority as resolved methods, see org.jetbrains.plugins.groovy.lang.resolve.processors.GroovyResolverProcessorImpl.getCandidates

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-12-14 16:06:00 +03:00
parent 627d5f88e0
commit cec8ce28d2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/resolve/GradleNonCodeMembersContributor.kt
+6 -5
View File
@@ -36,6 +36,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrRefere
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
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightField
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightMethodBuilder
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightVariable
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames.GROOVY_LANG_CLOSURE
@@ -120,10 +121,10 @@ class GradleNonCodeMembersContributor : NonCodeMembersContributor() {
val domainObjectFqn = TypesUtil.getQualifiedName(domainObjectType) ?: return
val psiManager = GroovyPsiManager.getInstance(place.project)
val psiClass = psiManager.findClassWithCache(domainObjectFqn, place.resolveScope) ?: return
if (GradleResolverUtil.canBeMethodOf(propCandidate, psiClass)) return
if (GradleResolverUtil.canBeMethodOf("get" + propCandidate.capitalize(), psiClass)) return
if (GradleResolverUtil.canBeMethodOf("set" + propCandidate.capitalize(), psiClass)) return
val domainObjectPsiClass = psiManager.findClassWithCache(domainObjectFqn, place.resolveScope) ?: return
if (GradleResolverUtil.canBeMethodOf(propCandidate, domainObjectPsiClass)) return
if (GradleResolverUtil.canBeMethodOf("get" + propCandidate.capitalize(), domainObjectPsiClass)) return
if (GradleResolverUtil.canBeMethodOf("set" + propCandidate.capitalize(), domainObjectPsiClass)) return
val closure = PsiTreeUtil.getParentOfType(place, GrClosableBlock::class.java)
val typeToDelegate = closure?.let { getDelegatesToInfo(it)?.typeToDelegate }
@@ -139,7 +140,7 @@ class GradleNonCodeMembersContributor : NonCodeMembersContributor() {
}
if (!shouldProcessMethods && shouldProcessProperties && place is GrReferenceExpression && place.parent !is GrApplicationStatement) {
val variable = object : GrLightVariable(place.manager, propCandidate, domainObjectType, place) {
val variable = object : GrLightField(propCandidate, domainObjectFqn, place) {
override fun getNavigationElement(): PsiElement {
val navigationElement = super.getNavigationElement()
return navigationElement