From b2e23def0fc0f3bc7c938837db8c0b4d83b8f03a Mon Sep 17 00:00:00 2001 From: hsshim Date: Fri, 8 Apr 2016 17:39:17 +0900 Subject: [PATCH 1/3] add python edit mode. --- zeppelin-web/bower.json | 1 + zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 1 + 2 files changed, 2 insertions(+) diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index c5fc7ab9332..b5ec64ee442 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -44,6 +44,7 @@ "main": [ "src-noconflict/ace.js", "src-noconflict/mode-scala.js", + "src-noconflict/mode-python.js", "src-noconflict/mode-sql.js", "src-noconflict/mode-markdown.js", "src-noconflict/mode-sh.js", diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index 599ed901fa6..eaba8324503 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -80,6 +80,7 @@ angular.module('zeppelinWebApp') var editorModes = { 'ace/mode/scala': /^%spark/, + 'ace/mode/python': /^%pyspark/, 'ace/mode/sql': /^%(\w*\.)?\wql/, 'ace/mode/markdown': /^%md/, 'ace/mode/sh': /^%sh/ From 63af8ad387d95fd36f05dd9c6732e8ed77d86c50 Mon Sep 17 00:00:00 2001 From: hsshim Date: Tue, 12 Apr 2016 11:12:14 +0900 Subject: [PATCH 2/3] add spark.pyspark condition. --- .../src/app/notebook/paragraph/paragraph.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index eaba8324503..5e1a44f2a68 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -79,8 +79,8 @@ angular.module('zeppelinWebApp') var angularObjectRegistry = {}; var editorModes = { - 'ace/mode/scala': /^%spark/, - 'ace/mode/python': /^%pyspark/, + 'ace/mode/python': /^%(spark\.)?pyspark\s*$/, + 'ace/mode/scala': /^%spark\s*$/, 'ace/mode/sql': /^%(\w*\.)?\wql/, 'ace/mode/markdown': /^%md/, 'ace/mode/sh': /^%sh/ From c0d579db25edad4ded4deb75ace5890515c232ec Mon Sep 17 00:00:00 2001 From: hsshim Date: Wed, 13 Apr 2016 10:25:21 +0900 Subject: [PATCH 3/3] fixed for a new interpreter group. --- .../src/app/notebook/paragraph/paragraph.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index 5e1a44f2a68..dbfbc7ab7d3 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -79,8 +79,8 @@ angular.module('zeppelinWebApp') var angularObjectRegistry = {}; var editorModes = { - 'ace/mode/python': /^%(spark\.)?pyspark\s*$/, - 'ace/mode/scala': /^%spark\s*$/, + 'ace/mode/python': /^%(\w*\.)?pyspark\s*$/, + 'ace/mode/scala': /^%(\w*\.)?spark\s*$/, 'ace/mode/sql': /^%(\w*\.)?\wql/, 'ace/mode/markdown': /^%md/, 'ace/mode/sh': /^%sh/