Update to Kotlin 1.3.50 and use new scripting API

Use the new Kotlin scripting API to register script templates.

Author: fwcd

gradle.properties

@@ -2,7 +2,7 @@ projectVersion=0.3.0
 teamCityUrl=https://teamcity.jetbrains.com
 teamCityUsername=guest
 teamCityPassword=guest
-kotlinVersion=1.3.40
-kotlinBuildType=Kotlin_1340_CompilerAllPlugins
-kotlinBuild=1.3.41-release-150
-kotlinPluginBuild=1.3.41-release-IJ2019.2-1
+kotlinVersion=1.3.50
+kotlinBuildType=Kotlin_1350_CompilerAllPlugins
+kotlinBuild=1.3.50-release-127
+kotlinPluginBuild=

scripts/update_kt_version.py

@@ -18,6 +18,10 @@ def is_plugin_artifact(art_name):
 def to_plugin_build(art_name):
     return art_name.lstrip("kotlin-plugin-").rstrip(".zip")
 
+class Unnamed:
+    def name(self):
+        return ""
+
 def main():
     props_file = "gradle.properties"
 
@@ -39,7 +43,7 @@ def main():
     build = prompt_by("build", builds, TeamCityNode.number).follow()
 
     artifacts = [art for art in build.follow("artifacts").findall("file") if is_plugin_artifact(art.name())]
-    artifact = prompt_by("plugin build", artifacts, lambda art: to_plugin_build(art.name()))
+    artifact = prompt_by("plugin build", artifacts, lambda art: to_plugin_build(art.name()), Unnamed())
 
     changes = {
         "kotlinVersion": version.name(),

scripts/utils/cli.py

@@ -21,7 +21,7 @@ def require_not_none(description, x):
     if x == None:
         sys.exit(description + " not present")
 
-def prompt_by(what, nodes, describer):
+def prompt_by(what, nodes, describer, default=None):
     node_dict = {describer(node): node for node in nodes}
     sorted_described = sorted(node_dict.keys(), key=alphanum_sort_key)
 
@@ -30,12 +30,12 @@ def prompt_by(what, nodes, describer):
     print()
 
     last_entry = sorted_described[-1] if len(sorted_described) > 0 else None
-    choice = input("Enter a " + what + " to choose [default: " + last_entry + "]: ").strip()
+    choice = input(f"Enter a {what} to choose [default: {last_entry}]: ").strip()
     print()
 
-    if len(choice) == 0:
+    if len(choice) == 0 and last_entry:
         return node_dict[last_entry]
     elif choice not in node_dict.keys():
-        sys.exit("Invalid " + what + "!")
+        return default
     else:
         return node_dict[choice]

server/build.gradle

@@ -47,6 +47,7 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-compiler-embeddable'
     implementation 'org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable'
     implementation 'org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable'
+    implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm-host-embeddable'
     implementation 'org.jetbrains.kotlin:kotlin-reflect'
     implementation 'org.jetbrains:fernflower:1.0'
     implementation 'com.pinterest.ktlint:ktlint-core:0.34.2'
@@ -62,10 +63,9 @@ dependencies {
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
     testImplementation 'junit:junit:4.11'
     testImplementation 'org.openjdk.jmh:jmh-core:1.20'
-    testImplementation 'org.jetbrains.kotlin:kotlin-scripting-jvm-host-embeddable'
 
     // See https://github.com/JetBrains/kotlin/blob/65b0a5f90328f4b9addd3a10c6f24f3037482276/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts#L8
-    testCompileOnly 'org.jetbrains.kotlin:kotlin-scripting-jvm-host'
+    compileOnly 'org.jetbrains.kotlin:kotlin-scripting-jvm-host'
 
     annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.20'
 }

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

@@ -24,22 +24,24 @@ import org.jetbrains.kotlin.container.ComponentProvider
 import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.jetbrains.kotlin.load.java.JvmAbi
+import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.BindingTraceContext
 import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer
 import org.jetbrains.kotlin.resolve.TopDownAnalysisMode.TopLevelDeclarations
 import org.jetbrains.kotlin.resolve.calls.components.InferenceSession
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
+import org.jetbrains.kotlin.resolve.extensions.ExtraImportsProviderExtension
 import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar
 import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionProvider
 import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider
 import org.jetbrains.kotlin.scripting.definitions.StandardScriptDefinition
-import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinition
+import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
+import org.jetbrains.kotlin.scripting.extensions.ScriptExtraImportsProviderExtension
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
 import org.jetbrains.kotlin.util.KotlinFrontEndException
@@ -51,6 +53,10 @@ import java.nio.file.Paths
 import java.net.URLClassLoader
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
+import kotlin.script.experimental.host.ScriptingHostConfiguration
+import kotlin.script.experimental.host.configurationDependencies
+import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
+import kotlin.script.experimental.jvm.JvmDependency
 import org.javacs.kt.util.KotlinLSException
 import org.javacs.kt.util.KotlinNullableNotNullManager
 import org.javacs.kt.util.LoggingMessageCollector
@@ -75,13 +81,13 @@ private class CompilationEnvironment(
             parentDisposable = disposable,
             // Not to be confused with the CompilerConfiguration in the language server Configuration
             configuration = KotlinCompilerConfiguration().apply {
-                put(CommonConfigurationKeys.MODULE_NAME, JvmAbi.DEFAULT_MODULE_NAME)
+                put(CommonConfigurationKeys.MODULE_NAME, JvmProtoBufUtil.DEFAULT_MODULE_NAME)
                 put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, LoggingMessageCollector)
                 add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar())
                 addJvmClasspathRoots(classPath.map { it.toFile() })
 
                 // Setup script templates
-                var scriptDefinitions: List<KotlinScriptDefinition> = listOf(StandardScriptDefinition)
+                var scriptDefinitions: List<ScriptDefinition> = listOf(ScriptDefinition.getDefault(defaultJvmScriptingHostConfiguration))
 
                 if (classPath.any { GRADLE_DSL_DEPENDENCY_PATTERN.matches(it.fileName.toString()) }) {
                     LOG.info("Configuring Kotlin DSL script templates...")
@@ -95,9 +101,10 @@ private class CompilationEnvironment(
                     try {
                         // Load template classes
                         val scriptClassLoader = URLClassLoader(classPath.map { it.toUri().toURL() }.toTypedArray())
-                        // TODO: Use org.jetbrains.kotlin.scripting.definitions.ScriptDefinition instead of
-                        //       KotlinScriptDefinition since the latter will be deprecated soon.
-                        scriptDefinitions = scriptTemplates.map { KotlinScriptDefinition(scriptClassLoader.loadClass(it).kotlin) }
+                        val scriptHostConfig = ScriptingHostConfiguration(defaultJvmScriptingHostConfiguration) {
+                            configurationDependencies(JvmDependency(classPath.map { it.toFile() }))
+                        }
+                        scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromTemplate(scriptHostConfig, scriptClassLoader.loadClass(it).kotlin) }
                     } catch (e: Exception) {
                         LOG.error("Error while loading script template classes")
                         LOG.printStackTrace(e)