Switch to a new REPL API

Author: ileasile

build.gradle

@@ -155,7 +155,7 @@ configurations {
 dependencies {
     compile project(":jupyter-lib")
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-    compile "org.jetbrains.kotlin:kotlin-scripting-jvm-host-embeddable:$kotlinVersion"
+    compile "org.jetbrains.kotlin:kotlin-scripting-ide-services-impl-embeddable:$kotlinVersion"
     compile "org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion"
     compile "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:$kotlinVersion"
     compile "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion"

jupyter-lib/src/main/kotlin/jupyter/kotlin/receivers/ConstReceiver.kt

@@ -0,0 +1,3 @@
+package jupyter.kotlin.receivers
+
+class ConstReceiver(val value: Int)

src/main/kotlin/org/jetbrains/kotlin/jupyter/receivers.kt jupyter-lib/src/main/kotlin/jupyter/kotlin/receivers/TypeProviderReceiver.kt

@@ -1,13 +1,11 @@
-package org.jetbrains.kotlin.jupyter
-
-class ConstReceiver(val value: Int)
+package jupyter.kotlin.receivers
 
 class TypeProviderReceiver {
 
     fun generateCode(values: List<Int>): List<String> {
         val properties = (0 until values.size)
                 .map { "val value$it : Int get() = list[$it]" }
-                .joinToLines()
+                .joinToString("\n")
 
         val classDeclaration = """
                 class TypedIntList###(val list: List<Int>): List<Int> by list {

resources/notebook-extension/kernel.js

@@ -153,7 +153,7 @@ define(function(){
             return -1;
         }
 
-        function getTokenBounds(buf, cursor) {
+        function getTokenBounds(buf, cursor, editor) {
             if (cursor > buf.length) {
                 throw new Error("Position " + cursor + " does not exist in code snippet <" + buf + ">");
             }
@@ -174,7 +174,9 @@ define(function(){
                 tokenBeforeCursor: buf.substring(start, cursor),
                 after: buf.substring(end, buf.length),
                 start: start,
-                end: end
+                end: end,
+                posStart: editor.posFromIndex(start),
+                posEnd: editor.posFromIndex(end)
             }
         }
 
@@ -211,7 +213,7 @@ define(function(){
             cursor_pos = utils.js_idx_to_char_idx(cursor_pos, text);
 
             var prevBounds = this.tokenBounds;
-            var bounds = getTokenBounds(text, cursor_pos);
+            var bounds = getTokenBounds(text, cursor_pos, this.editor);
             this.tokenBounds = bounds;
             if (prevBounds && this.raw_result) {
                 if (bounds.before === prevBounds.before &&
@@ -223,6 +225,10 @@ define(function(){
                         if (displayName[0] === '`')
                             displayName = displayName.substring(1, displayName.length - 1);
                         return displayName.startsWith(bounds.tokenBeforeCursor)
+                    }).map((completion) => {
+                        completion.from = bounds.posStart;
+                        completion.to = bounds.posEnd;
+                        return completion;
                     });
 
                     if (newResult.length > 0) {
@@ -542,7 +548,7 @@ define(function(){
             var optionsLen;
             var index;
             var prevIndex;
-            if (code == keycodes.enter) {
+            if (code == keycodes.enter && !event.shiftKey) {
                 event.codemirrorIgnore = true;
                 event._ipkmIgnore = true;
                 event.preventDefault();
@@ -608,7 +614,7 @@ define(function(){
         };
 
         function _isCompletionKey(key) {
-            return key.length === 1;
+            return /^[A-Z0-9.:"]$/i.test(key);
         }
 
         Completer.prototype.keypress = function (event) {
@@ -675,12 +681,16 @@ define(function(){
                 .forEach(it => it.clear());
         }
 
-        CodeCell.prototype._handle_change = function(cm, changes) {
-            this.notebook.get_cells().forEach((cell) =>{
+        function clearAllErrors(notebook) {
+            notebook.get_cells().forEach((cell) =>{
                 if (cell.code_mirror) {
                     clearErrors(cell.code_mirror);
                 }
             });
+        }
+
+        CodeCell.prototype._handle_change = function(cm, changes) {
+            clearAllErrors(this.notebook);
             this.kernel.listErrors(cm.getValue(), (msg) => {
                 var content = msg.content;
                 console.log(content);
@@ -832,6 +842,7 @@ define(function(){
         };
 
         CodeCell.prototype._handle_execute_reply = function (msg) {
+            clearAllErrors(this.notebook)
             this.bindEvents();
 
             this.set_input_prompt(msg.content.execution_count);

src/main/kotlin/org/jetbrains/kotlin/jupyter/config.kt

@@ -23,7 +23,7 @@ val LocalSettingsPath = Paths.get(System.getProperty("user.home"), ".jupyter_kot
 val GitHubApiHost = "api.github.com"
 val GitHubRepoOwner = "kotlin"
 val GitHubRepoName = "kotlin-jupyter"
-val GitHubBranchName = "demo-jan2020"
+val GitHubBranchName = "psi_completion_with_typing"
 val GitHubApiPrefix = "https://$GitHubApiHost/repos/$GitHubRepoOwner/$GitHubRepoName"
 
 val LibraryDescriptorExt = "json"

src/main/kotlin/org/jetbrains/kotlin/jupyter/protocol.kt

@@ -13,6 +13,7 @@ import java.io.PrintStream
 import java.lang.reflect.InvocationTargetException
 import java.util.concurrent.atomic.AtomicLong
 import kotlin.concurrent.timer
+import kotlin.script.experimental.api.ScriptDiagnostic
 
 enum class ResponseState {
     Ok, Error, Abort
@@ -356,17 +357,18 @@ fun JupyterConnection.evalWithIO(config: OutputConfig, srcMessage: Message, body
             forkedOut.flush()
             forkedError.flush()
 
-            val additionalInfo = ex.errorResult.location?.let {
-                val errorMessage = ex.errorResult.message
-                jsonObject("lineStart" to it.line, "colStart" to it.column,
-                        "lineEnd" to it.lineEnd, "colEnd" to it.columnEnd,
+            val firstDiagnostic = ex.firstDiagnostics
+            val additionalInfo = firstDiagnostic?.location?.let {
+                val errorMessage = firstDiagnostic.message
+                jsonObject("lineStart" to it.start.line, "colStart" to it.start.col,
+                        "lineEnd" to (it.end?.line ?: -1), "colEnd" to (it.end?.col ?: -1),
                         "message" to errorMessage,
-                        "path" to it.path)
+                        "path" to firstDiagnostic.sourcePath.orEmpty())
             } ?: jsonObject()
 
             ErrorResponseWithMessage(
                     textResult("Error!"),
-                    ex.errorResult.message,
+                    ex.message,
                     ex.javaClass.canonicalName,
                     ex.message ?: "",
                     ex.stackTrace.map { it.toString() },
@@ -376,8 +378,8 @@ fun JupyterConnection.evalWithIO(config: OutputConfig, srcMessage: Message, body
 
             val stdErr = StringBuilder()
             with(stdErr) {
-                val cause = ex.errorResult.cause
-                if (cause == null) appendln(ex.errorResult.message)
+                val cause = ex.cause
+                if (cause == null) appendln(ex.message)
                 else {
                     when (cause) {
                         is InvocationTargetException -> appendln(cause.targetException.toString())