Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/ZEPPELIN-2297' into ZEPPELIN-2297

Browse source
This commit is contained in:
Tinkoff DWH 2017-03-28 11:32:17 +05:00
commit ef6c9cb0c8
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file

@ -640,6 +640,19 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
var remoteCompleter = {
getCompletions: function(editor, session, pos, prefix, callback) {
var langTools = ace.require('ace/ext/language_tools');
var defaultKeywords = new Set();
var getDefaultKeywords = function(err, completions) {
if (completions !== undefined) {
completions.forEach(function(c) {
defaultKeywords.add(c.value);
});
}
}
if (langTools.keyWordCompleter !== undefined) {
langTools.keyWordCompleter.getCompletions(editor, session, pos, prefix, getDefaultKeywords);
}
if (!editor.isFocused()) {
return;
}
@ -665,6 +678,9 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
var completions = [];
for (var c in data.completions) {
var v = data.completions[c];
if (v.meta !== undefined && v.meta === 'keyword' && defaultKeywords.has(v.value.trim())) {
continue;
}
completions.push({
name: v.name,
value: v.value,