diff options
| author | Simon Ogorodnik <sem-oro@yandex.ru> | 2016-11-08 18:31:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 18:31:36 +0300 |
| commit | beb338920611e802754fc7a8d71a61ee14bd1ea0 (patch) | |
| tree | dd369d145d57bd74300f5a55546adca0152c919d /core/src/main | |
| parent | c4cf001951bbe92223fdedaf4bb5fbdeddeb2472 (diff) | |
| parent | a014843ed2de90c6ac73e2a8acb41f617ff86432 (diff) | |
| download | dokka-beb338920611e802754fc7a8d71a61ee14bd1ea0.tar.gz dokka-beb338920611e802754fc7a8d71a61ee14bd1ea0.tar.bz2 dokka-beb338920611e802754fc7a8d71a61ee14bd1ea0.zip | |
Merge pull request #110 from Kotlin/0.9.10/GH-79
Fix for GH-79 , KT-13299 Critical bug, top-level Kotlin functions from libraries not resolved
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/kotlin/Analysis/AnalysisEnvironment.kt | 4 |
1 files changed, 3 insertions, 1 deletions
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) |