You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2018/09/26 02:16:36 UTC
incubator-toree git commit: [HOTFIX] Fix ScalaInterpreterSpec test
failures
Repository: incubator-toree
Updated Branches:
refs/heads/master f58a86f2a -> a742ec657
[HOTFIX] Fix ScalaInterpreterSpec test failures
Closes #163
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/a742ec65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/a742ec65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/a742ec65
Branch: refs/heads/master
Commit: a742ec657e9e2e6a6e21f6d4e30ecb7e685e8239
Parents: f58a86f
Author: Luciano Resende <lr...@apache.org>
Authored: Tue Sep 25 21:50:41 2018 -0400
Committer: Luciano Resende <lr...@apache.org>
Committed: Tue Sep 25 22:02:48 2018 -0400
----------------------------------------------------------------------
.../toree/kernel/interpreter/scala/ScalaInterpreter.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a742ec65/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
----------------------------------------------------------------------
diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
index 86bcc62..8d60c67 100644
--- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
+++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
@@ -190,9 +190,9 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I
}
def prepareResult(interpreterOutput: String,
- showOutput: Boolean = true,
showType: Boolean = false,
- noTruncate: Boolean = false
+ noTruncate: Boolean = false,
+ showOutput: Boolean = true
): (Option[AnyRef], Option[String], Option[String]) = {
if (interpreterOutput.isEmpty) {
return (None, None, None)
@@ -300,7 +300,7 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I
val lastOutput = lastResultOut.toString("UTF-8").trim
lastResultOut.reset()
- val (obj, defStr, text) = prepareResult(lastOutput, KernelOptions.showOutput, KernelOptions.showTypes, KernelOptions.noTruncation )
+ val (obj, defStr, text) = prepareResult(lastOutput, KernelOptions.showTypes, KernelOptions.noTruncation, KernelOptions.showOutput )
defStr.foreach(kernel.display.content(MIMEType.PlainText, _))
text.foreach(kernel.display.content(MIMEType.PlainText, _))
val output = obj.map(Displayers.display(_).asScala.toMap).getOrElse(Map.empty)