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

JavacWrapper: add support for JvmPackageName annotation

Browse Source 
This fixes previously added testWithStdLib/streams.kt test
This commit is contained in:
Mikhail Glukhikh
2019-09-10 17:17:22 +03:00
parent e8cf0b5d4f
commit bbd8fb8b23
6 changed files with 132 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+1 -1
View File
@@ -319,7 +319,7 @@ class KotlinCoreEnvironment private constructor(
): Boolean {
return JavacWrapperRegistrar.registerJavac(
projectEnvironment.project, configuration, javaFiles, kotlinFiles, arguments, bootClasspath, sourcePath,
LightClassGenerationSupport.getInstance(project)
LightClassGenerationSupport.getInstance(project), packagePartProviders
)
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperRegistrar.kt
+4 -2
View File
@@ -21,6 +21,7 @@ import com.sun.tools.javac.util.Context
import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR
import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider
import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys
@@ -39,7 +40,8 @@ object JavacWrapperRegistrar {
arguments: Array<String>?,
bootClasspath: List<File>?,
sourcePath: List<File>?,
lightClassGenerationSupport: LightClassGenerationSupport
lightClassGenerationSupport: LightClassGenerationSupport,
packagePartsProviders: List<JvmPackagePartProvider>
): Boolean {
val messageCollector = configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
@@ -60,7 +62,7 @@ object JavacWrapperRegistrar {
val javacWrapper = JavacWrapper(
javaFiles, kotlinFiles, arguments, jvmClasspathRoots, bootClasspath, sourcePath,
kotlinSupertypesResolver, compileJava, outputDirectory, context
kotlinSupertypesResolver, packagePartsProviders, compileJava, outputDirectory, context
)
project.registerService(JavacWrapper::class.java, javacWrapper)