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:19:41 UTC
[1/2] incubator-toree git commit: TOREE-363: Fix syntax highlighting.
Repository: incubator-toree
Updated Branches:
refs/heads/master bb6765bae -> e5ef3a104
TOREE-363: Fix syntax highlighting.
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/eeeacd6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/eeeacd6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/eeeacd6e
Branch: refs/heads/master
Commit: eeeacd6eeaf3003d1cee3d16218b1cd05f62b47f
Parents: d629761
Author: Ryan Blue <bl...@apache.org>
Authored: Tue Feb 14 13:35:29 2017 -0800
Committer: Ryan Blue <bl...@apache.org>
Committed: Wed Feb 15 13:11:14 2017 -0800
----------------------------------------------------------------------
.../main/scala/org/apache/toree/interpreter/Interpreter.scala | 4 +++-
.../org/apache/toree/boot/layer/HandlerInitialization.scala | 4 +++-
.../org/apache/toree/kernel/protocol/v5/LanguageInfo.scala | 4 +++-
.../toree/kernel/interpreter/pyspark/PySparkInterpreter.scala | 4 +++-
.../toree/kernel/interpreter/scala/ScalaInterpreter.scala | 7 ++++++-
.../toree/kernel/interpreter/sparkr/SparkRInterpreter.scala | 7 ++++++-
.../apache/toree/kernel/interpreter/sql/SqlInterpreter.scala | 7 ++++++-
7 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/eeeacd6e/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 29907f3..59696de 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
@@ -27,7 +27,9 @@ case class LanguageInfo(
name: String,
version: String,
fileExtension: Option[String] = None,
- pygmentsLexer: Option[String] = None) {
+ pygmentsLexer: Option[String] = None,
+ mimeType: Option[String] = None,
+ codemirrorMode: Option[String] = None) {
}
trait Interpreter {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/eeeacd6e/kernel/src/main/scala/org/apache/toree/boot/layer/HandlerInitialization.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/layer/HandlerInitialization.scala b/kernel/src/main/scala/org/apache/toree/boot/layer/HandlerInitialization.scala
index 8739079..3da8469 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/layer/HandlerInitialization.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/layer/HandlerInitialization.scala
@@ -162,7 +162,9 @@ trait StandardHandlerInitialization extends HandlerInitialization {
name=langInfo.name,
version=langInfo.version,
file_extension=langInfo.fileExtension,
- pygments_lexer=langInfo.pygmentsLexer)
+ pygments_lexer=langInfo.pygmentsLexer,
+ mimetype=langInfo.mimeType,
+ codemirror_mode=langInfo.codemirrorMode)
// These are the handlers for messages coming into the
initializeRequestHandler(classOf[ExecuteRequestHandler],
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/eeeacd6e/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala
index 161181e..5ad8aff 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala
@@ -21,5 +21,7 @@ case class LanguageInfo(
name: String,
version: String,
file_extension: Option[String] = None,
- pygments_lexer: Option[String] = None) {
+ pygments_lexer: Option[String] = None,
+ mimetype: Option[String] = None,
+ codemirror_mode: Option[String] = None) {
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/eeeacd6e/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 d408217..3ff3a52 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
@@ -168,6 +168,8 @@ class PySparkInterpreter(
"python",
version = version,
fileExtension = Some(".py"),
- pygmentsLexer = Some("python"))
+ pygmentsLexer = Some("python"),
+ mimeType = Some("text/x-ipython"),
+ codemirrorMode = Some("text/x-ipython"))
}
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/eeeacd6e/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 3dec18c..5f36a1e 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
@@ -323,7 +323,12 @@ class ScalaInterpreter(private val config:Config = ConfigFactory.load) extends I
/**
* Returns the language metadata for syntax highlighting
*/
- override def languageInfo = LanguageInfo("scala", BuildInfo.scalaVersion, fileExtension = Some(".scala"))
+ override def languageInfo = LanguageInfo(
+ "scala", BuildInfo.scalaVersion,
+ fileExtension = Some(".scala"),
+ pygmentsLexer = Some("scala"),
+ mimeType = Some("text/x-scala"),
+ codemirrorMode = Some("text/x-scala"))
}
object ScalaInterpreter {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/eeeacd6e/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 54bf14a..1c330bf 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
@@ -150,7 +150,12 @@ class SparkRInterpreter(
"-e",
"cat(R.version$major, '.', R.version$minor, sep='', fill=TRUE)").!!
- LanguageInfo("R", version = version, fileExtension = Some(".R"), pygmentsLexer = Some("r"))
+ LanguageInfo(
+ "R", version = version,
+ fileExtension = Some(".R"),
+ pygmentsLexer = Some("r"),
+ mimeType = Some("text/x-rsrc"),
+ codemirrorMode = Some("text/x-rsrc"))
}
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/eeeacd6e/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 df2952b..29e988a 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
@@ -107,6 +107,11 @@ class SqlInterpreter() extends Interpreter {
// Unsupported
override def doQuietly[T](body: => T): T = ???
- override def languageInfo = LanguageInfo("sql", BuildInfo.sparkVersion, fileExtension = Some(".sql"), pygmentsLexer = Some("sql"))
+ override def languageInfo = LanguageInfo(
+ "sql", BuildInfo.sparkVersion,
+ fileExtension = Some(".sql"),
+ pygmentsLexer = Some("sql"),
+ mimeType = Some("text/x-sql"),
+ codemirrorMode = Some("text/x-sql"))
}
[2/2] incubator-toree git commit: TOREE-363 Merging pr #100
Posted by ma...@apache.org.
TOREE-363 Merging pr #100
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/e5ef3a10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/e5ef3a10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/e5ef3a10
Branch: refs/heads/master
Commit: e5ef3a10464102d596fd4c16a64e75331d8f9f39
Parents: bb6765b eeeacd6
Author: mariusvniekerk <ma...@gmail.com>
Authored: Thu Feb 16 13:19:33 2017 -0500
Committer: mariusvniekerk <ma...@gmail.com>
Committed: Thu Feb 16 13:19:33 2017 -0500
----------------------------------------------------------------------
.../main/scala/org/apache/toree/interpreter/Interpreter.scala | 4 +++-
.../org/apache/toree/boot/layer/HandlerInitialization.scala | 4 +++-
.../org/apache/toree/kernel/protocol/v5/LanguageInfo.scala | 4 +++-
.../toree/kernel/interpreter/pyspark/PySparkInterpreter.scala | 4 +++-
.../toree/kernel/interpreter/scala/ScalaInterpreter.scala | 7 ++++++-
.../toree/kernel/interpreter/sparkr/SparkRInterpreter.scala | 7 ++++++-
.../apache/toree/kernel/interpreter/sql/SqlInterpreter.scala | 7 ++++++-
7 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------