PSI-based completion

Author: ileasile

build.gradle

@@ -7,7 +7,7 @@ import java.util.stream.Collectors
 
 buildscript {
     ext.shadowJarVersion = "5.2.0"
-    ext.kotlinVersion = '1.3.70-eap-3'
+    ext.kotlinVersion = '1.3-SNAPSHOT'
     ext.baseVersion = '0.7.41'
     repositories {
         jcenter()
@@ -62,8 +62,12 @@ allprojects {
         distributionPath = rootPath.resolve("distrib")
         //noinspection GroovyAssignabilityCheck
         distribBuildPath = rootPath.resolve("distrib-build")
+
+        resourcesDir = "resources"
         //noinspection GroovyAssignabilityCheck
-        logosPath = getSubDir(rootPath, "resources", "logos")
+        logosPath = getSubDir(rootPath, resourcesDir, "logos")
+        //noinspection GroovyAssignabilityCheck
+        nbExtensionPath = getSubDir(rootPath, resourcesDir, "notebook-extension")
 
         if (project == rootProject) {
             isProtectedBranch = isProtectedBranch()
@@ -95,7 +99,6 @@ allprojects {
         debuggerConfig = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort".toString()
 
         mainSourceSetDir = "main"
-        resourcesDir = "resources"
         runtimePropertiesFile = "runtime.properties"
 
         jarsPath = "jars"
@@ -246,7 +249,9 @@ void createCleanTasks() {
         task(makeTaskName(cleanInstallDirTaskPrefix, local)) {
             group(local ? localGroup : distribGroup)
             doLast {
-                dir.deleteDir()
+                if(!dir.deleteDir()) {
+                    throw new Exception("Cannot delete $dir")
+                }
             }
         }
     }
@@ -309,6 +314,7 @@ void createMainInstallTask(Boolean debug, Boolean local, String group, String sp
     def taskName = "$taskNamePrefix$taskNameMiddle$taskNameSuffix"
 
     def dependencies = [
+            makeTaskName(cleanInstallDirTaskPrefix, local),
             local ? copyRunKernelPy : prepareDistributionDir,
             makeTaskName(installKernelTaskPrefix, local),
             makeTaskName(installLibsTaskPrefix, local),
@@ -340,6 +346,10 @@ void makeKernelSpec(Path installPath, Boolean localInstall) {
         from logosPath
         into installPath
     }
+    project.copy {
+        from nbExtensionPath
+        into installPath
+    }
 }
 
 void makeJarArgs(Path installPath, String kernelJarPath, List<String> classPath, String debuggerConfig = "") {

jupyter-lib/src/main/kotlin/jupyter/kotlin/completion/KotlinContext.kt

@@ -0,0 +1,100 @@
+package jupyter.kotlin
+
+import java.util.*
+import kotlin.reflect.KFunction
+import kotlin.reflect.KProperty
+
+/**
+ * Kotlin REPL has built-in context for getting user-declared functions and variables
+ * and setting invokeWrapper for additional side effects in evaluation.
+ * It can be accessed inside REPL by name `kc`, e.g. kc.showVars()
+ */
+class KotlinContext(val vars: HashMap<String, KotlinVariableInfo> = HashMap(),
+                    val functions: MutableSet<KotlinFunctionInfo> = TreeSet()) {
+
+    fun getVarsList(): List<KotlinVariableInfo> {
+        return ArrayList(vars.values)
+    }
+
+    fun getFunctionsList(): List<KotlinFunctionInfo> {
+        return ArrayList(functions)
+    }
+}
+
+
+
+/**
+ * The implicit receiver for lines in Kotlin REPL.
+ * It is passed to the script as an implicit receiver, identical to:
+ * with (context) {
+ * ...
+ * }
+ *
+ * KotlinReceiver can be inherited from and passed to REPL building properties,
+ * so other variables and functions can be accessed inside REPL.
+ * By default, it only has KotlinContext.
+ * Inherited KotlinReceivers should be in separate java file, they can't be inner or nested.
+ */
+class KotlinReceiver {
+    var kc: KotlinContext? = null
+}
+
+fun functionSignature(function: KFunction<*>): String {
+    return function.toString().replace("Line_\\d+\\.".toRegex(), "")
+}
+
+fun shortenType(name: String): String {
+    return name.replace("(\\b[_a-zA-Z$][_a-zA-Z0-9$]*\\b\\.)+".toRegex(), "")
+    // kotlin.collections.List<kotlin.Int> -> List<Int>
+}
+
+class KotlinFunctionInfo(private val function: KFunction<*>) : Comparable<KotlinFunctionInfo> {
+
+    val name: String
+        get() = function.name
+
+    fun toString(shortenTypes: Boolean): String {
+        return if (shortenTypes) {
+            shortenType(toString())
+        } else toString()
+    }
+
+    override fun toString(): String {
+        return functionSignature(function)
+    }
+
+    override fun compareTo(other: KotlinFunctionInfo): Int {
+        return this.toString().compareTo(other.toString())
+    }
+
+    override fun hashCode(): Int {
+        return this.toString().hashCode()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is KotlinFunctionInfo) {
+            this.toString() == other.toString()
+        } else false
+    }
+}
+
+class KotlinVariableInfo(private val value: Any?, private val descriptor: KProperty<*>) {
+
+    val name: String
+        get() = descriptor.name
+
+    val type: String
+        get() = descriptor.returnType.toString()
+
+    fun toString(shortenTypes: Boolean): String {
+        var type: String = type
+        if (shortenTypes) {
+            type = shortenType(type)
+        }
+        return "$name: $type = $value"
+    }
+
+    override fun toString(): String {
+        return toString(false)
+    }
+}