From 92a50b2880a25fe71c40aac6ada978c42194482f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 23 Jan 2019 17:12:37 +0300 Subject: [PATCH] Minor: explicitly use FULL mode for resolve, tests are falling otherwise --- .../highlighter/KotlinHighlightExitPointsHandlerFactory.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt index 5af88d5a679..4ab7419e29a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsResultOfLambda import org.jetbrains.kotlin.resolve.inline.InlineUtil +import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode class KotlinHighlightExitPointsHandlerFactory : HighlightUsagesHandlerFactoryBase() { companion object { @@ -111,7 +112,7 @@ class KotlinHighlightExitPointsHandlerFactory : HighlightUsagesHandlerFactoryBas return false } - val bindingContext = expression.analyze() + val bindingContext = expression.analyze(BodyResolveMode.FULL) if (!expression.isUsedAsResultOfLambda(bindingContext)) { return false } @@ -157,7 +158,7 @@ private fun KtExpression.getRelevantDeclaration(): KtDeclarationWithBody? { } if (InlineUtil.canBeInlineArgument(parent) && - !InlineUtil.isInlinedArgument(parent as KtFunction, parent.analyze(), false) + !InlineUtil.isInlinedArgument(parent as KtFunction, parent.analyze(BodyResolveMode.FULL), false) ) { return parent }