You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ma...@apache.org on 2017/02/16 18:16:24 UTC

[1/2] incubator-toree git commit: TOREE-379: Fix code completion reply.

Repository: incubator-toree
Updated Branches:
  refs/heads/master abcc0c822 -> bb6765bae


TOREE-379: Fix code completion reply.

The start and end positions were swapped, causing the front-ends to
replace no characters from the partial symbol that is completed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/a7aa5eb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/a7aa5eb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/a7aa5eb8

Branch: refs/heads/master
Commit: a7aa5eb8072b7c15edff717c382a155dc52f7a50
Parents: 5887de8
Author: Ryan Blue <bl...@apache.org>
Authored: Fri Feb 3 14:37:20 2017 -0800
Committer: Ryan Blue <bl...@apache.org>
Committed: Mon Feb 13 15:04:31 2017 -0800

----------------------------------------------------------------------
 .../toree/kernel/protocol/v5/handler/CodeCompleteHandler.scala   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a7aa5eb8/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CodeCompleteHandler.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CodeCompleteHandler.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CodeCompleteHandler.scala
index f03309e..78a7a48 100644
--- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CodeCompleteHandler.scala
+++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CodeCompleteHandler.scala
@@ -48,8 +48,8 @@ class CodeCompleteHandler(actorLoader: ActorLoader)
     val codeCompleteFuture = ask(interpreterActor, cr).mapTo[(Int, List[String])]
     codeCompleteFuture.onComplete {
       case Success(tuple) =>
-        val reply = CompleteReplyOk(tuple._2, cr.cursor_pos,
-                                    tuple._1, Metadata())
+        val reply = CompleteReplyOk(tuple._2, tuple._1,
+                                    cr.cursor_pos, Metadata())
         val completeReplyType = MessageType.Outgoing.CompleteReply.toString
         logKernelMessageAction("Sending code complete reply for", km)
         actorLoader.load(SystemActorType.KernelMessageRelay) !


[2/2] incubator-toree git commit: TOREE-379 Merging pr #99

Posted by ma...@apache.org.
TOREE-379 Merging pr #99


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/bb6765ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/bb6765ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/bb6765ba

Branch: refs/heads/master
Commit: bb6765bae50fa11afc1a52718df228dcd65dcbeb
Parents: abcc0c8 a7aa5eb
Author: mariusvniekerk <ma...@gmail.com>
Authored: Thu Feb 16 13:16:22 2017 -0500
Committer: mariusvniekerk <ma...@gmail.com>
Committed: Thu Feb 16 13:16:22 2017 -0500

----------------------------------------------------------------------
 .../toree/kernel/protocol/v5/handler/CodeCompleteHandler.scala   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------