From 66ef49cecc722f2dc61fbbe8273d9c3034a7eaca Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Tue, 25 Feb 2020 14:40:45 +0300 Subject: [PATCH] Fix CCE under composite mode This commit essentially reverts change in IdeaResolverForProject made in 423aeb9a08582f88a974afdebdb7d17924ec8980 The issue is that 'platform.findAnalyzerServices' may return non- CompositeAnalyzerServices even under composite analysis mode, when platform is single-target (e.g. 'JvmAnalyzerServices' for JVM-only) ^KT-36978 --- .../kotlin/idea/caches/resolve/IdeaResolverForProject.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt index 4c5465d80f5..04fbbf94315 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt @@ -113,7 +113,7 @@ class IdeaResolverForProject( commonPlatformParameters, jvmPlatformParameters, platform, - platform.findAnalyzerServices(projectContext.project) as CompositeAnalyzerServices + CompositeAnalyzerServices(platform.componentPlatforms.map { it.findAnalyzerServices() }) ) } }