WIP: Update ScriptDefinitionProvider

Updates the script (and script dependencies) provider to the most recent
API. The issue that no declarators can be found for SCRIPT declarations
persists however (this can be verified using the EditFunctionTest).

Author: fwcd

gradle.properties

@@ -1,7 +1,7 @@
 teamCityUrl=https://teamcity.jetbrains.com
 teamCityUsername=guest
 teamCityPassword=guest
-kotlinVersion=1.3.30
+kotlinVersion=1.3.31
 kotlinBuildType=Kotlin_1330_CompilerAllPlugins
 kotlinBuild=1.3.31-release-198
 kotlinPluginBuild=1.3.31-release-IJ2019.1-1

server/build.gradle

@@ -31,7 +31,8 @@ configurations {
 }
 
 dependencies {
-    def kotlinTeamCity = "$kotlinBuildType:$kotlinBuild:kotlin-plugin-${kotlinPluginBuild}.zip!/Kotlin"
+    def kotlinCompilerTC = "$kotlinBuildType:$kotlinBuild:kotlin-compiler-${kotlinVersion}.zip!/kotlinc"
+    def kotlinPluginTC = "$kotlinBuildType:$kotlinBuild:kotlin-plugin-${kotlinPluginBuild}.zip!/Kotlin"
 
     implementation project(':shared')
     implementation 'com.google.guava:guava:21.0'
@@ -43,8 +44,11 @@ dependencies {
 
     implementation fileTree(dir: "$projectDir/lib-kotlin", include: ["*.jar"])
 
-    kotlinJVMLib tc("$kotlinTeamCity/lib/kotlin-plugin.jar")
-    kotlinJVMLib tc("$kotlinTeamCity/lib/j2k.jar")
+    kotlinJVMLib tc("$kotlinCompilerTC/lib/kotlin-scripting-impl.jar")
+    // TODO: The dependency above will be renamed in Kotlin 1.3.50:
+    // kotlinJVMLib tc("$kotlinCompilerTC/lib/kotlin-scripting-compiler-impl.jar")
+    kotlinJVMLib tc("$kotlinPluginTC/lib/kotlin-plugin.jar")
+    kotlinJVMLib tc("$kotlinPluginTC/lib/j2k.jar")
 }
 
 applicationDistribution.into('bin') {

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

@@ -7,6 +7,7 @@ import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.psi.PsiFileFactory
 import com.intellij.mock.MockProject
 import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider
+import org.jetbrains.kotlin.scripting.legacy.CliScriptDependenciesProvider
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
@@ -30,6 +31,8 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProvid
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.script.KotlinScriptDefinition
 import org.jetbrains.kotlin.script.ScriptDefinitionProvider
+import org.jetbrains.kotlin.script.ScriptDependenciesProvider
+import org.jetbrains.kotlin.script.StandardScriptDefinition
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
 import org.jetbrains.kotlin.util.KotlinFrontEndException
@@ -45,10 +48,11 @@ import org.javacs.kt.util.LoggingMessageCollector
  * Incrementally compiles files and expressions.
  * The basic strategy for compiling one file at-a-time is outlined in OneFilePerformance.
  */
-class Compiler(classPath: Set<Path>) {
+class Compiler(classPath: Set<Path>, workspaceRoots: Set<Path>) {
     private val config = CompilerConfiguration().apply {
         put(CommonConfigurationKeys.MODULE_NAME, JvmAbi.DEFAULT_MODULE_NAME)
         put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, LoggingMessageCollector)
+        put(JVMConfigurationKeys.SCRIPT_DEFINITIONS, listOf(StandardScriptDefinition))
         addJvmClasspathRoots(classPath.map { it.toFile() })
     }
     val environment: KotlinCoreEnvironment
@@ -62,6 +66,8 @@ class Compiler(classPath: Set<Path>) {
         )
         val project = environment.project
         if (project is MockProject) {
+            project.registerService(ScriptDefinitionProvider::class.java, CliScriptDefinitionProvider())
+            project.registerService(ScriptDependenciesProvider::class.java, CliScriptDependenciesProvider(project))
             project.registerService(NullableNotNullManager::class.java, KotlinNullableNotNullManager(project))
         }
     }
@@ -71,7 +77,7 @@ class Compiler(classPath: Set<Path>) {
     private val scripts = ScriptDefinitionProvider.getInstance(environment.project) as? CliScriptDefinitionProvider
 
     init {
-        scripts?.setScriptDefinitions(listOf(KotlinScriptDefinition(Any::class)))
+        scripts?.setScriptDefinitions(listOf(StandardScriptDefinition))
     }
 
     fun createFile(content: String, file: Path = Paths.get("dummy.kt")): KtFile {

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

@@ -6,7 +6,7 @@ import java.nio.file.Path
 class CompilerClassPath {
     private val workspaceRoots = mutableSetOf<Path>()
     private val classPath = mutableSetOf<Path>()
-    var compiler = Compiler(classPath)
+    var compiler = Compiler(classPath, workspaceRoots)
         private set
 
     private fun refresh() {
@@ -21,7 +21,7 @@ class CompilerClassPath {
 
             classPath.removeAll(removed)
             classPath.addAll(added)
-            compiler = Compiler(classPath)
+            compiler = Compiler(classPath, workspaceRoots)
         }
     }
 

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

@@ -9,7 +9,7 @@ class CompiledFileTest {
     val compiledFile = compileFile()
 
     fun compileFile(): CompiledFile {
-        val compiler = Compiler(setOf())
+        val compiler = Compiler(setOf(), setOf())
         val file = testResourcesRoot().resolve("compiledFile/CompiledFileExample.kt")
         val content = Files.readAllLines(file).joinToString("\n")
         val parse = compiler.createFile(content, file)
@@ -24,4 +24,4 @@ class CompiledFileTest {
 
         assertThat(type.toString(), equalTo("Int"))
     }
-}
+}

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

@@ -11,7 +11,7 @@ import org.junit.Test
 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 = """
@@ -69,4 +69,4 @@ private class FileToEdit {
 
         assertThat(target.name, hasToString("intFunction"))
     }
-}
+}