From 9821f94e94a6e15520a125966ee6f990945714f8 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Sun, 5 Jun 2016 19:33:00 -0700 Subject: [PATCH] Support syntax hightlight for python and r interpreter --- .../src/app/notebook/paragraph/paragraph.controller.js | 3 ++- zeppelin-web/src/app/search/result-list.controller.js | 4 +++- 2 files changed, 5 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 3c867373760..ae13efff3a2 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -79,8 +79,9 @@ angular.module('zeppelinWebApp') var angularObjectRegistry = {}; var editorModes = { - 'ace/mode/python': /^%(\w*\.)?pyspark\s*$/, + 'ace/mode/python': /^%(\w*\.)?(pyspark|python)\s*$/, 'ace/mode/scala': /^%(\w*\.)?spark\s*$/, + 'ace/mode/r': /^%(\w*\.)?(r|sparkr|knitr)\s*$/, 'ace/mode/sql': /^%(\w*\.)?\wql/, 'ace/mode/markdown': /^%md/, 'ace/mode/sh': /^%sh/ diff --git a/zeppelin-web/src/app/search/result-list.controller.js b/zeppelin-web/src/app/search/result-list.controller.js index 949e01f50b1..bba88f086b9 100644 --- a/zeppelin-web/src/app/search/result-list.controller.js +++ b/zeppelin-web/src/app/search/result-list.controller.js @@ -43,7 +43,9 @@ angular return function(_editor) { function getEditorMode(text) { var editorModes = { - 'ace/mode/scala': /^%spark/, + 'ace/mode/scala': /^%(\w*\.)?spark/, + 'ace/mode/python': /^%(\w*\.)?(pyspark|python)/, + 'ace/mode/r': /^%(\w*\.)?(r|sparkr|knitr)/, 'ace/mode/sql': /^%(\w*\.)?\wql/, 'ace/mode/markdown': /^%md/, 'ace/mode/sh': /^%sh/