From a014843ed2de90c6ac73e2a8acb41f617ff86432 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 8 Nov 2016 18:08:00 +0300 Subject: Fix for GH-79 , KT-13299 Critical bug, top-level Kotlin functions from libraries not resolved --- core/src/main/kotlin/Analysis/AnalysisEnvironment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/src/main') diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt index d3abf41f..46fcb6c2 100644 --- a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt +++ b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.analyzer.ResolverForModule import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.config.* import org.jetbrains.kotlin.config.* @@ -94,7 +95,8 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable { listOf(module), { ModuleContent(sourceFiles, GlobalSearchScope.allScope(environment.project)) }, JvmPlatformParameters { module }, - CompilerEnvironment + CompilerEnvironment, + packagePartProviderFactory = { info, content -> JvmPackagePartProvider(environment, content.moduleContentScope) } ) val resolverForModule = resolverForProject.resolverForModule(module) -- cgit