Honor disabled script support in compiler

Author: fwcd

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

@@ -15,7 +15,11 @@ import java.nio.file.Path
  * Manages the class path (compiled JARs, etc), the Java source path
  * and the compiler. Note that Kotlin sources are stored in SourcePath.
  */
-class CompilerClassPath(private val config: CompilerConfiguration, private val databaseService: DatabaseService) : Closeable {
+class CompilerClassPath(
+    private val config: CompilerConfiguration,
+    private val scriptsConfig: ScriptsConfiguration,
+    private val databaseService: DatabaseService
+) : Closeable {
     val workspaceRoots = mutableSetOf<Path>()
 
     private val javaSourcePath = mutableSetOf<Path>()
@@ -24,7 +28,13 @@ class CompilerClassPath(private val config: CompilerConfiguration, private val d
     val outputDirectory: File = Files.createTempDirectory("klsBuildOutput").toFile()
     val javaHome: String? = System.getProperty("java.home", null)
 
-    var compiler = Compiler(javaSourcePath, classPath.map { it.compiledJar }.toSet(), buildScriptClassPath, outputDirectory)
+    var compiler = Compiler(
+        javaSourcePath,
+        classPath.map { it.compiledJar }.toSet(),
+        buildScriptClassPath,
+        scriptsConfig,
+        outputDirectory
+    )
         private set
 
     private val async = AsyncExecutor()
@@ -72,7 +82,13 @@ class CompilerClassPath(private val config: CompilerConfiguration, private val d
         if (refreshCompiler) {
             LOG.info("Reinstantiating compiler")
             compiler.close()
-            compiler = Compiler(javaSourcePath, classPath.map { it.compiledJar }.toSet(), buildScriptClassPath, outputDirectory)
+            compiler = Compiler(
+                javaSourcePath,
+                classPath.map { it.compiledJar }.toSet(),
+                buildScriptClassPath,
+                scriptsConfig,
+                outputDirectory
+            )
             updateCompilerConfiguration()
         }
 

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

@@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture.completedFuture
 class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
     val config = Configuration()
     val databaseService = DatabaseService()
-    val classPath = CompilerClassPath(config.compiler, databaseService)
+    val classPath = CompilerClassPath(config.compiler, config.scripts, databaseService)
 
     private val tempDirectory = TemporaryDirectory()
     private val uriContentProvider = URIContentProvider(ClassContentProvider(config.externalSources, classPath, tempDirectory, CompositeSourceArchiveProvider(JdkSourceArchiveProvider(classPath), ClassPathSourceArchiveProvider(classPath))))