Add workspaceRoots as Java source roots in Kotlin compiler config

Author: fwcd

server/src/main/kotlin/org/javacs/kt/Compiler.kt

@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
+import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoots
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
 import org.jetbrains.kotlin.cli.jvm.plugins.PluginCliParser
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
@@ -86,6 +87,7 @@ private val GRADLE_DSL_DEPENDENCY_PATTERN = Regex("^gradle-(?:kotlin-dsl|core).*
  * files and expressions.
  */
 private class CompilationEnvironment(
+    workspaceRoots: Set<Path>,
     classPath: Set<Path>
 ) : Closeable {
     private val disposable = Disposer.newDisposable()
@@ -112,6 +114,7 @@ private class CompilationEnvironment(
                 put(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, languageVersionSettings)
                 put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, LoggingMessageCollector)
                 add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar())
+                addJavaSourceRoots(workspaceRoots.map { it.toFile() })
                 addJvmClasspathRoots(classPath.map { it.toFile() })
 
                 // Setup script templates (e.g. used by Gradle's Kotlin DSL)
@@ -160,6 +163,8 @@ private class CompilationEnvironment(
             configFiles = EnvironmentConfigFiles.JVM_CONFIG_FILES
         )
 
+        // TODO: Use environment.addKotlinSourceRoots(workspaceRoots) and update those instead of using a custom SourcePath/SourceFile mechanism
+
         val project = environment.project
         if (project is MockProject) {
             project.registerService(NullableNotNullManager::class.java, KotlinNullableNotNullManager(project))
@@ -219,12 +224,12 @@ enum class CompilationKind {
  * Incrementally compiles files and expressions.
  * The basic strategy for compiling one file at-a-time is outlined in OneFilePerformance.
  */
-class Compiler(classPath: Set<Path>, buildScriptClassPath: Set<Path> = emptySet()) : Closeable {
+class Compiler(workspaceRoots: Set<Path>, classPath: Set<Path>, buildScriptClassPath: Set<Path> = emptySet()) : Closeable {
     private var closed = false
     private val localFileSystem: VirtualFileSystem
 
-    private val defaultCompileEnvironment = CompilationEnvironment(classPath)
-    private val buildScriptCompileEnvironment = buildScriptClassPath.takeIf { it.isNotEmpty() }?.let(::CompilationEnvironment)
+    private val defaultCompileEnvironment = CompilationEnvironment(workspaceRoots, classPath)
+    private val buildScriptCompileEnvironment = buildScriptClassPath.takeIf { it.isNotEmpty() }?.let { CompilationEnvironment(workspaceRoots, it) }
     private val compileLock = ReentrantLock() // TODO: Lock at file-level
 
     companion object {

server/src/main/kotlin/org/javacs/kt/CompilerClassPath.kt

@@ -8,7 +8,7 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
     private val workspaceRoots = mutableSetOf<Path>()
     private val classPath = mutableSetOf<Path>()
     private val buildScriptClassPath = mutableSetOf<Path>()
-    var compiler = Compiler(classPath, buildScriptClassPath)
+    var compiler = Compiler(workspaceRoots, classPath, buildScriptClassPath)
         private set
 
     init {
@@ -36,7 +36,7 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
 
         if (refreshCompiler) {
             compiler.close()
-            compiler = Compiler(classPath, buildScriptClassPath)
+            compiler = Compiler(workspaceRoots, classPath, buildScriptClassPath)
             updateCompilerConfiguration()
         }
     }

server/src/test/kotlin/org/javacs/kt/CompiledFileTest.kt

@@ -15,13 +15,13 @@ class CompiledFileTest {
         }
     }
 
-    fun compileFile(): CompiledFile = Compiler(setOf()).use { compiler ->
+    fun compileFile(): CompiledFile = Compiler(setOf(), setOf()).use { compiler ->
         val file = testResourcesRoot().resolve("compiledFile/CompiledFileExample.kt")
         val content = Files.readAllLines(file).joinToString("\n")
-        val parse = compiler.createFile(content, file)
+        val parse = compiler.createKtFile(content, file)
         val classPath = CompilerClassPath(CompilerConfiguration())
         val sourcePath = listOf(parse)
-        val (context, container) = compiler.compileFiles(sourcePath, sourcePath)
+        val (context, container) = compiler.compileKtFiles(sourcePath, sourcePath)
         CompiledFile(content, parse, context, container, sourcePath, classPath)
     }
 

server/src/test/kotlin/org/javacs/kt/CompilerTest.kt

@@ -13,7 +13,7 @@ import org.junit.BeforeClass
 import java.nio.file.Files
 
 class CompilerTest {
-    val compiler = Compiler(setOf())
+    val compiler = Compiler(setOf(), setOf())
     val myTestResources = testResourcesRoot().resolve("compiler")
     val file = myTestResources.resolve("FileToEdit.kt")
     val editedText = """