From 7c07796438dcc49513c6801ca85e5f6eaa4a3ac7 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Thu, 10 Nov 2016 16:31:33 +0300 Subject: [PATCH] [groovy] move GrReferenceResolveRunner to *.resolve package --- .../statements/expressions/GrReferenceExpressionImpl.java | 1 + .../expressions => resolve}/GrReferenceResolveRunner.kt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) rename plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/{psi/impl/statements/expressions => resolve}/GrReferenceResolveRunner.kt (96%) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java index a954d027048a..423045a26066 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java @@ -53,6 +53,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.literal import org.jetbrains.plugins.groovy.lang.psi.typeEnhancers.GrExpressionTypeCalculator; import org.jetbrains.plugins.groovy.lang.psi.typeEnhancers.GrReferenceTypeEnhancer; import org.jetbrains.plugins.groovy.lang.psi.util.*; +import org.jetbrains.plugins.groovy.lang.resolve.GrReferenceResolveRunner; import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil; import org.jetbrains.plugins.groovy.lang.resolve.processors.GroovyResolverProcessor; import org.jetbrains.plugins.groovy.lang.resolve.processors.GroovyResolverProcessorBuilder; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceResolveRunner.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrReferenceResolveRunner.kt similarity index 96% rename from plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceResolveRunner.kt rename to plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrReferenceResolveRunner.kt index 60ef6f7a4e1e..1999ddf047a4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceResolveRunner.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrReferenceResolveRunner.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions +package org.jetbrains.plugins.groovy.lang.resolve import com.intellij.psi.* import com.intellij.psi.scope.PsiScopeProcessor @@ -27,9 +27,9 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethod import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression import org.jetbrains.plugins.groovy.lang.psi.impl.GrTraitType 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.typeEnhancers.ClosureParameterEnhancer import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil -import org.jetbrains.plugins.groovy.lang.resolve.* import org.jetbrains.plugins.groovy.lang.resolve.processors.ClassHint class GrReferenceResolveRunner(val place: GrReferenceExpression, val processor: PsiScopeProcessor) { @@ -97,7 +97,7 @@ class GrReferenceResolveRunner(val place: GrReferenceExpression, val processor: } private fun processQualifierType(qualifierType: PsiType, state: ResolveState): Boolean { - val type = if (qualifierType is PsiDisjunctionType) qualifierType.leastUpperBound else qualifierType + val type = (qualifierType as? PsiDisjunctionType)?.leastUpperBound ?: qualifierType return doProcessQualifierType(type, state) }