Merge branch 'ZEPPELIN-277' of github.com:malayhm/zeppelin into ZEPPELIN-277

malayhm · malayhm · commit 63d69e1c0ca0 · 2017-10-10T18:04:40.000+05:30
# Conflicts:
#	zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
diff --git a/docs/development/writing_zeppelin_interpreter.md b/docs/development/writing_zeppelin_interpreter.md
@@ -74,7 +74,8 @@ Here is an example of `interpreter-setting.json` on your own interpreter.
     },
     "editor": {
       "language": "your-syntax-highlight-language",
-      "editOnDblClick": false
+      "editOnDblClick": false,
+      "completionKey": "TAB"
     }
   },
   {
@@ -128,6 +129,19 @@ If your interpreter uses mark-up language such as markdown or HTML, set `editOnD
   "editOnDblClick": false
 }
 ```
+
+### Completion key (Optional)
+By default, `Ctrl+dot(.)` brings autocompletion list in the editor.
+Through `completionKey`, each interpreter can configure autocompletion key.
+Currently `TAB` is only available option.
+
+```
+"editor": {
+  "completionKey": "TAB"
+}
+```
+
+
 ## Install your interpreter binary
 
 Once you have built your interpreter, you can place it under the interpreter directory with all its dependencies.
diff --git a/python/src/main/resources/interpreter-setting.json b/python/src/main/resources/interpreter-setting.json
@@ -44,7 +44,8 @@
     },
     "editor": {
       "language": "python",
-      "editOnDblClick": false
+      "editOnDblClick": false,
+      "completionKey": "TAB"
     }
   },
   {
diff --git a/spark/src/main/resources/interpreter-setting.json b/spark/src/main/resources/interpreter-setting.json
@@ -71,7 +71,8 @@
     },
     "editor": {
       "language": "scala",
-      "editOnDblClick": false
+      "editOnDblClick": false,
+      "completionKey": "TAB"
     }
   },
   {
@@ -110,7 +111,8 @@
     },
     "editor": {
       "language": "sql",
-      "editOnDblClick": false
+      "editOnDblClick": false,
+      "completionKey": "TAB"
     }
   },
   {
@@ -135,7 +137,8 @@
     },
     "editor": {
       "language": "scala",
-      "editOnDblClick": false
+      "editOnDblClick": false,
+      "completionKey": "TAB"
     }
   },
   {
@@ -160,7 +163,8 @@
     },
     "editor": {
       "language": "python",
-      "editOnDblClick": false
+      "editOnDblClick": false,
+      "completionKey": "TAB"
     }
   },
   {
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -185,6 +185,11 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
     }
   }
 
+  const isTabCompletion = function() {
+    const completionKey = $scope.paragraph.config.editorSetting.completionKey
+    return completionKey === 'TAB'
+  }
+
   $scope.$on('updateParagraphOutput', function (event, data) {
     if ($scope.paragraph.id === data.paragraphId) {
       if (!$scope.paragraph.results) {
@@ -870,9 +875,9 @@ function ParagraphCtrl ($scope, $rootScope, $route, $window, $routeParams, $loca
           let currentLine = $scope.editor.session.getLine(iCursor.row)
           let isAllTabs = currentLine.substring(0, iCursor.column - 1).split('').every(function(char) { return (char === '\t' || char === ' ') })
 
-          // If user has pressed tab on first line char or if editor mode is %md, keep existing behavior
+          // If user has pressed tab on first line char or if isTabCompletion() is false, keep existing behavior
           // If user has pressed tab anywhere in between and editor mode is not %md, show autocomplete
-          if (!isAllTabs && iCursor.column && $scope.paragraph.config.editorMode !== 'ace/mode/markdown') {
+          if (!isAllTabs && iCursor.column && isTabCompletion()) {
             $scope.editor.execCommand('startAutocomplete')
           } else {
             ace.config.loadModule('ace/ext/language_tools', function () {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@`
`44`	`44`	`},`
`45`	`45`	`"editor": {`
`46`	`46`	`"language": "python",`
`47`		`- "editOnDblClick": false`
	`47`	`+ "editOnDblClick": false,`
	`48`	`+ "completionKey": "TAB"`
`48`	`49`	`}`
`49`	`50`	`},`
`50`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@`
`71`	`71`	`},`
`72`	`72`	`"editor": {`
`73`	`73`	`"language": "scala",`
`74`		`- "editOnDblClick": false`
	`74`	`+ "editOnDblClick": false,`
	`75`	`+ "completionKey": "TAB"`
`75`	`76`	`}`
`76`	`77`	`},`
`77`	`78`	`{`
`@@ -110,7 +111,8 @@`
`110`	`111`	`},`
`111`	`112`	`"editor": {`
`112`	`113`	`"language": "sql",`
`113`		`- "editOnDblClick": false`
	`114`	`+ "editOnDblClick": false,`
	`115`	`+ "completionKey": "TAB"`
`114`	`116`	`}`
`115`	`117`	`},`
`116`	`118`	`{`
`@@ -135,7 +137,8 @@`
`135`	`137`	`},`
`136`	`138`	`"editor": {`
`137`	`139`	`"language": "scala",`
`138`		`- "editOnDblClick": false`
	`140`	`+ "editOnDblClick": false,`
	`141`	`+ "completionKey": "TAB"`
`139`	`142`	`}`
`140`	`143`	`},`
`141`	`144`	`{`
`@@ -160,7 +163,8 @@`
`160`	`163`	`},`
`161`	`164`	`"editor": {`
`162`	`165`	`"language": "python",`
`163`		`- "editOnDblClick": false`
	`166`	`+ "editOnDblClick": false,`
	`167`	`+ "completionKey": "TAB"`
`164`	`168`	`}`
`165`	`169`	`},`
`166`	`170`	`{`