Added message collector to compiler configuration

Author: fwcd

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

@@ -7,11 +7,12 @@ import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.psi.PsiFileFactory
 import com.intellij.mock.MockProject
 import org.jetbrains.kotlin.cli.common.script.CliScriptDefinitionProvider
+import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 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.JvmClasspathRoot
+import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
@@ -38,6 +39,7 @@ import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
 import org.javacs.kt.util.KotlinLSException
 import org.javacs.kt.util.KotlinNullableNotNullManager
+import org.javacs.kt.util.LoggingMessageCollector
 
 /**
  * Incrementally compiles files and expressions.
@@ -46,7 +48,8 @@ import org.javacs.kt.util.KotlinNullableNotNullManager
 class Compiler(classPath: Set<Path>) {
     private val config = CompilerConfiguration().apply {
         put(CommonConfigurationKeys.MODULE_NAME, JvmAbi.DEFAULT_MODULE_NAME)
-        addAll(JVMConfigurationKeys.CONTENT_ROOTS, classPath.map { JvmClasspathRoot(it.toFile()) })
+        put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, LoggingMessageCollector)
+        addJvmClasspathRoots(classPath.map { it.toFile() })
     }
     val environment: KotlinCoreEnvironment
 

src/main/kotlin/org/javacs/kt/util/LoggingMessageCollector.kt

@@ -0,0 +1,16 @@
+package org.javacs.kt.util
+
+import org.jetbrains.kotlin.cli.common.messages.MessageCollector
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
+import org.javacs.kt.LOG
+
+object LoggingMessageCollector: MessageCollector {
+	override fun clear() {}
+
+	override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
+		LOG.fine("Kotlin compiler: [$severity] $message @ $location")
+	}
+
+	override fun hasErrors() = false
+}