From 69c4db82d47cc39bc3e3d76b746834a4825df356 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Tue, 9 Jul 2019 16:41:54 +0300 Subject: [PATCH] Uast: `IdeaKotlinUastResolveProviderService` analyze as `BodyResolveMode.PARTIAL_WITH_CFA` it is required for `isUsedAsResultOfLambda` in `KotlinULambdaExpression` --- .../src/IdeaKotlinUastResolveProviderService.kt | 3 ++- .../src/IdeaKotlinUastResolveProviderService.kt.182 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt b/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt index 12d4a26acba..b897dfd624a 100644 --- a/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt +++ b/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt @@ -37,11 +37,12 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.calls.callUtil.getCall import org.jetbrains.kotlin.platform.jvm.isJvm +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.uast.kotlin.KotlinUastResolveProviderService class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService { - override fun getBindingContext(element: KtElement) = element.analyze(BodyResolveMode.PARTIAL) + override fun getBindingContext(element: KtElement) = element.analyze(BodyResolveMode.PARTIAL_WITH_CFA) override fun getTypeMapper(element: KtElement): KotlinTypeMapper? { return KotlinTypeMapper( diff --git a/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182 b/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182 index 1eb04bffafb..6cbaf1348ee 100644 --- a/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182 +++ b/plugins/uast-kotlin-idea/src/IdeaKotlinUastResolveProviderService.kt.182 @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.uast.kotlin.KotlinUastResolveProviderService class IdeaKotlinUastResolveProviderService : KotlinUastResolveProviderService { - override fun getBindingContext(element: KtElement) = element.analyze(BodyResolveMode.PARTIAL) + override fun getBindingContext(element: KtElement) = element.analyze(BodyResolveMode.PARTIAL_WITH_CFA) override fun getTypeMapper(element: KtElement): KotlinTypeMapper? { return KotlinTypeMapper(