From 5adec8390706c0c826b694198aba78ad77959a85 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 28 Sep 2015 17:33:11 +0300 Subject: [PATCH] Minor. Fix util function getResolutionScope. --- idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt index 2d7a82ce68b..db53246500c 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt @@ -87,9 +87,8 @@ public fun ThisReceiver.asExpression(resolutionScope: JetScope, psiFactory: JetP public fun PsiElement.getResolutionScope(bindingContext: BindingContext, resolutionFacade: ResolutionFacade): LexicalScope { for (parent in parentsWithSelf) { - if (parent is JetExpression) { - val scope = bindingContext[BindingContext.LEXICAL_SCOPE, parent] ?: - bindingContext[BindingContext.RESOLUTION_SCOPE, parent]?.asLexicalScope() // todo remove this hack + if (parent is JetElement) { + val scope = bindingContext[BindingContext.LEXICAL_SCOPE, parent] if (scope != null) return scope }