Kotlin DSL support

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,9 +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
+    compileOnly 'org.jetbrains.kotlin:kotlin-scripting-jvm-host'
     testCompileOnly 'org.jetbrains.kotlin:kotlin-scripting-jvm-host'
 
     annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.20'
@@ -96,6 +97,11 @@ task copyPropertiesToTestWorkspace(type: Copy) {
     into file('src/test/resources/additionalWorkspace')
 }
 
+task copyPropertiesToDSLTestWorkspace(type: Copy) {
+    from "$rootDir/gradle.properties"
+    into file('src/test/resources/kotlinDSLWorkspace')
+}
+
 task fixFilePermissions(type: Exec) {
     // When running on macOS or Linux the start script
     // needs executable permissions to run.
@@ -132,7 +138,7 @@ run {
 }
 
 test {
-    dependsOn copyPropertiesToTestWorkspace
+    dependsOn copyPropertiesToTestWorkspace, copyPropertiesToDSLTestWorkspace
 
     testLogging {
         events 'failed'

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

@@ -15,15 +15,18 @@ import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.types.KotlinType
+import java.nio.file.Paths
 
 class CompiledFile(
-        val content: String,
-        val parse: KtFile,
-        val compile: BindingContext,
-        val container: ComponentProvider,
-        val sourcePath: Collection<KtFile>,
-        val classPath: CompilerClassPath) {
-
+    val content: String,
+    val parse: KtFile,
+    val compile: BindingContext,
+    val container: ComponentProvider,
+    val sourcePath: Collection<KtFile>,
+    val classPath: CompilerClassPath,
+    val isScript: Boolean = false,
+    val kind: CompilationKind = CompilationKind.DEFAULT
+) {
     /**
      * Find the type of the expression at `cursor`
      */
@@ -38,7 +41,7 @@ class CompiledFile(
             bindingContextOf(expression, scopeWithImports).getType(expression)
 
     fun bindingContextOf(expression: KtExpression, scopeWithImports: LexicalScope): BindingContext =
-            classPath.compiler.compileExpression(expression, scopeWithImports, sourcePath).first
+            classPath.compiler.compileExpression(expression, scopeWithImports, sourcePath, kind).first
 
     private fun expandForType(cursor: Int, surroundingExpr: KtExpression): KtExpression {
         val dotParent = surroundingExpr.parent as? KtDotQualifiedExpression
@@ -120,7 +123,7 @@ class CompiledFile(
         }
 
         val padOffset = " ".repeat(offset)
-        val recompile = classPath.compiler.createFile(padOffset + surroundingContent)
+        val recompile = classPath.compiler.createFile(padOffset + surroundingContent, Paths.get("dummy.virtual" + if (isScript) ".kts" else ".kt"), kind)
         return recompile.findElementAt(cursor)?.findParent<KtElement>()
     }