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 2016/11/07 14:29:34 UTC
[11/15] incubator-toree git commit: Fixed incorrect override.
Fixed incorrect override.
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/5f2715d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/5f2715d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/5f2715d6
Branch: refs/heads/master
Commit: 5f2715d656e5a459eae730d0409a3f8eb936b602
Parents: 77565fb
Author: Marius van Niekerk <ma...@maxpoint.com>
Authored: Tue Nov 1 19:15:04 2016 -0400
Committer: Marius van Niekerk <ma...@maxpoint.com>
Committed: Tue Nov 1 19:15:04 2016 -0400
----------------------------------------------------------------------
.../toree/kernel/interpreter/scala/ScalaInterpreter.scala | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/5f2715d6/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 4c04436..6f347f5 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
@@ -316,7 +316,12 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I
}
override def classLoader: ClassLoader = _runtimeClassloader
- }
+
+ /**
+ * Returns the language metadata for syntax highlighting
+ */
+ override def languageInfo = LanguageInfo("scala", BuildInfo.scalaVersion, fileExtension = Some(".scala"))
+}
object ScalaInterpreter {
@@ -337,7 +342,4 @@ object ScalaInterpreter {
outputDir
}
-
- override def languageInfo = LanguageInfo("scala", BuildInfo.scalaVersion, fileExtension = Some(".scala"))
-
}