azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow AnalysisHandlerExtension to provide additional classpath on retry

Browse Source
This commit is contained in:
Jiaxiang Chen
2020-11-24 01:28:58 -08:00
committed by Simon Ogorodnik
parent a6cb156ce9
commit 1a377069dd
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+4
View File
@@ -463,6 +463,10 @@ object KotlinToJVMBytecodeCompiler {
environment.updateClasspath(result.additionalJavaRoots.map { JavaSourceRoot(it, null) }) environment.updateClasspath(result.additionalJavaRoots.map { JavaSourceRoot(it, null) })
} }
if (result.additionalClassPathRoots.isNotEmpty()) {
environment.updateClasspath(result.additionalClassPathRoots.map { JvmClasspathRoot(it, false) })
}
if (result.additionalKotlinRoots.isNotEmpty()) { if (result.additionalKotlinRoots.isNotEmpty()) {
environment.addKotlinSourceRoots(result.additionalKotlinRoots) environment.addKotlinSourceRoots(result.additionalKotlinRoots)
} }
compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt
+1
View File
@@ -72,6 +72,7 @@ open class AnalysisResult protected constructor(
moduleDescriptor: ModuleDescriptor, moduleDescriptor: ModuleDescriptor,
val additionalJavaRoots: List<File>, val additionalJavaRoots: List<File>,
val additionalKotlinRoots: List<File>, val additionalKotlinRoots: List<File>,
val additionalClassPathRoots: List<File> = emptyList(),
val addToEnvironment: Boolean = true val addToEnvironment: Boolean = true
) : AnalysisResult(bindingContext, moduleDescriptor) ) : AnalysisResult(bindingContext, moduleDescriptor)