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

Test: add java source files as JavaSourceRoot

Browse Source 
so that those can be properly populated in SingleJavaRootsIndex
This commit is contained in:
Jinseong Jeon
2022-06-13 15:36:57 -07:00
committed by Ilya Kirillov
parent cb2a54cef8
commit a2da690afd
37 changed files with 285 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
+17 -4
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.test.services.configuration
import com.intellij.ide.highlighter.JavaFileType
import com.intellij.openapi.util.SystemInfo
import com.intellij.psi.PsiJavaModule.MODULE_INFO_FILE
import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
@@ -217,17 +218,29 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
val javaSourceFiles = module.javaFiles.filter { INCLUDE_JAVA_AS_BINARY !in it.directives }
if (javaSourceFiles.isNotEmpty() && JvmEnvironmentConfigurationDirectives.SKIP_JAVA_SOURCES !in module.directives && ALL_JAVA_AS_BINARY !in registeredDirectives) {
javaSourceFiles.forEach { testServices.sourceFileProvider.getRealFileForSourceFile(it) }
if (javaSourceFiles.isNotEmpty() &&
JvmEnvironmentConfigurationDirectives.SKIP_JAVA_SOURCES !in module.directives &&
ALL_JAVA_AS_BINARY !in registeredDirectives
) {
// NB: [getRealFileForSourceFile] is misleading, since it actually creates a real file from the given test file as well.
val realSourceFileMap = javaSourceFiles.associateWith { testServices.sourceFileProvider.getRealFileForSourceFile(it) }
// TODO: temporary hack to provide java 9 modules in the source mode properly (see comment on ClasspathRootsResolved::addModularRoots)
addJavaCompiledModulesFromDependentKotlinModules(configuration, configurationKind, module, bySources = true)
val moduleInfoFiles = javaSourceFiles.filter { it.name == MODULE_INFO_FILE }
val (moduleInfoFiles, sourceFiles) = javaSourceFiles.partition { it.name == MODULE_INFO_FILE }
if (moduleInfoFiles.isNotEmpty()) {
addJavaSourceRootsByJavaModules(configuration, moduleInfoFiles)
} else {
sourceFiles.forEach l@{ testFile ->
val file = realSourceFileMap[testFile] ?: return@l
if (JvmEnvironmentConfigurationDirectives.USE_JAVAC !in module.directives &&
!file.isDirectory &&
file.extension == JavaFileType.DEFAULT_EXTENSION
) {
configuration.addJavaSourceRoot(file)
}
}
configuration.addJavaSourceRoot(testServices.sourceFileProvider.javaSourceDirectory)
}
}