You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ch...@apache.org on 2016/09/27 17:23:47 UTC
[8/8] incubator-toree git commit: Provide default implementations for
Provide default implementations for
Interpreter.completion(code: String, pos: Int)
Interpreter.isComplete(code: String)
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/c8144c6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/c8144c6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/c8144c6c
Branch: refs/heads/master
Commit: c8144c6cbd3ff00d874d85dd14b1653e23cb366f
Parents: baac922
Author: Marius van Niekerk <ma...@maxpoint.com>
Authored: Thu Sep 22 21:34:17 2016 -0400
Committer: Marius van Niekerk <ma...@gmail.com>
Committed: Tue Sep 27 12:52:54 2016 -0400
----------------------------------------------------------------------
.../scala/org/apache/toree/interpreter/Interpreter.scala | 6 +++---
kernel/src/test/scala/test/utils/DummyInterpreter.scala | 10 ----------
.../kernel/interpreter/pyspark/PySparkInterpreter.scala | 7 -------
.../interpreter/scala/ScalaInterpreterSpecific.scala | 4 ----
.../interpreter/scala/ScalaInterpreterSpecific.scala | 1 +
.../kernel/interpreter/sparkr/SparkRInterpreter.scala | 7 -------
.../toree/kernel/interpreter/sql/SqlInterpreter.scala | 7 -------
7 files changed, 4 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c8144c6c/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
index 77fb04e..84d0e70 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
@@ -23,6 +23,7 @@ import org.apache.toree.kernel.api.KernelLike
import scala.tools.nsc.interpreter._
+
trait Interpreter {
/**
@@ -108,14 +109,13 @@ trait Interpreter {
* @param pos The cursor position
* @return The cursor position and list of possible completions
*/
- def completion(code: String, pos: Int): (Int, List[String] )
-
+ def completion(code: String, pos: Int): (Int, List[String] ) = (pos, Nil)
/**
* Attempt to determine if a multiline block of code is complete
* @param code The code to determine for completeness
*/
- def isComplete(code: String): (String, String)
+ def isComplete(code: String): (String, String) = ("unknown", "")
/**
* Returns the name of the variable created from the last execution.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c8144c6c/kernel/src/test/scala/test/utils/DummyInterpreter.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/test/utils/DummyInterpreter.scala b/kernel/src/test/scala/test/utils/DummyInterpreter.scala
index 87441e6..a4adedd 100644
--- a/kernel/src/test/scala/test/utils/DummyInterpreter.scala
+++ b/kernel/src/test/scala/test/utils/DummyInterpreter.scala
@@ -108,16 +108,6 @@ class DummyInterpreter(kernel: KernelLike) extends Interpreter {
override def interpret(code: String, silent: Boolean, outputStreamResult: Option[OutputStream]): (Result, Either[ExecuteOutput, ExecuteFailure]) = ???
/**
- * Attempts to perform code completion via the <TAB> command.
- * @param code The current cell to complete
- * @param pos The cursor position
- * @return The cursor position and list of possible completions
- */
- override def completion(code: String, pos: Int): (Int, List[String]) = ???
-
- override def isComplete(code: String) = ???
-
- /**
* Initializes the interpreter.
* @param kernel The kernel
* @return The newly initialized interpreter
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c8144c6c/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala
----------------------------------------------------------------------
diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala
index e522c5b..9b59c73 100644
--- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala
+++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala
@@ -133,13 +133,6 @@ class PySparkInterpreter(
// Unsupported (but can be invoked)
override def read(variableName: String): Option[AnyRef] = None
- // Unsupported (but can be invoked)
- override def completion(code: String, pos: Int): (Int, List[String]) =
- (pos, Nil)
-
- // Unsupported (but can be invoked)
- override def isComplete(code: String): (String, String) = ("unknown", "")
-
// Unsupported
override def updatePrintStreams(in: InputStream, out: OutputStream, err: OutputStream): Unit = ???
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c8144c6c/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala
----------------------------------------------------------------------
diff --git a/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala b/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala
index 80b01ad..0cb8ce3 100644
--- a/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala
+++ b/scala-interpreter/src/main/scala-2.10/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala
@@ -343,10 +343,6 @@ trait ScalaInterpreterSpecific { this: ScalaInterpreter =>
(result.cursor, result.candidates)
}
- override def isComplete(code: String): (String, String) = {
- ("unknown", "")
- }
-
protected def newSettings(args: List[String]): Settings =
new SparkCommandLine(args).settings
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c8144c6c/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala
----------------------------------------------------------------------
diff --git a/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala b/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala
index 999ead4..62f70a1 100644
--- a/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala
+++ b/scala-interpreter/src/main/scala-2.11/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpecific.scala
@@ -309,6 +309,7 @@ trait ScalaInterpreterSpecific extends SettingsProducerLike { this: ScalaInterpr
* @return The cursor position and list of possible completions
*/
override def completion(code: String, pos: Int): (Int, List[String]) = {
+
require(completer != null)
logger.debug(s"Attempting code completion for ${code}")
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c8144c6c/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala
----------------------------------------------------------------------
diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala
index 68be6f7..91b4b7b 100644
--- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala
+++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala
@@ -123,13 +123,6 @@ class SparkRInterpreter(
// Unsupported (but can be invoked)
override def read(variableName: String): Option[AnyRef] = None
- // Unsupported (but can be invoked)
- override def completion(code: String, pos: Int): (Int, List[String]) =
- (pos, Nil)
-
- // Unsupported (but can be invoked)
- override def isComplete(code: String): (String, String) = ("unknown", "")
-
// Unsupported
override def updatePrintStreams(in: InputStream, out: OutputStream, err: OutputStream): Unit = ???
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c8144c6c/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala
----------------------------------------------------------------------
diff --git a/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala b/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala
index 74fbee1..ad7f684 100644
--- a/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala
+++ b/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala
@@ -91,13 +91,6 @@ class SqlInterpreter() extends Interpreter {
// Unsupported (but can be invoked)
override def read(variableName: String): Option[AnyRef] = None
- // Unsupported (but can be invoked)
- override def completion(code: String, pos: Int): (Int, List[String]) =
- (pos, Nil)
-
- // Unsupported (but can be invoked)
- override def isComplete(code: String): (String, String) = ("unknown", "")
-
// Unsupported
override def updatePrintStreams(in: InputStream, out: OutputStream, err: OutputStream): Unit = ???