-
Notifications
You must be signed in to change notification settings - Fork 979
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DRILL-5868: Support SQL syntax highlighting of queries
Based on the commit for DRILL-5981 (PR #1043), this commit further leverages the Ace JavaScript library with customizations specific to Drill. This commit introduces the following to the Query Editor (including the Edit Query tab within an existing profile to rerunning the query). 1. Syntax highlighting (This is supported for submitted query profiles 2. Autocomplete supported in editors 3. Specifying Drill specific keywords and functions in visible autocomplete 4. Key snippets (template SQLs) allowing for rapid writing of syntax: i. Query System Tables ii. CView, CTAS and CTempTAS iii. Alter Session iv. Explain and Select * queries NOTE: The lists for #3 and #4 are not exhaustive. As more features are added to Drill, these lists can be expanded.
- Loading branch information
Kunal Khatua
committed
Jan 8, 2018
1 parent
b4ffa40
commit 8f41c4e
Showing
8 changed files
with
641 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
exec/java-exec/src/main/resources/rest/static/js/ace-code-editor/ext-language_tools.js
Large diffs are not rendered by default.
Oops, something went wrong.
199 changes: 199 additions & 0 deletions
199
exec/java-exec/src/main/resources/rest/static/js/ace-code-editor/mode-snippets.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,199 @@ | ||
| ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"], function(require, exports, module) { | ||
| "use strict"; | ||
|
|
||
| var oop = require("../../lib/oop"); | ||
| var BaseFoldMode = require("./fold_mode").FoldMode; | ||
| var Range = require("../../range").Range; | ||
|
|
||
| var FoldMode = exports.FoldMode = function() {}; | ||
| oop.inherits(FoldMode, BaseFoldMode); | ||
|
|
||
| (function() { | ||
|
|
||
| this.getFoldWidgetRange = function(session, foldStyle, row) { | ||
| var range = this.indentationBlock(session, row); | ||
| if (range) | ||
| return range; | ||
|
|
||
| var re = /\S/; | ||
| var line = session.getLine(row); | ||
| var startLevel = line.search(re); | ||
| if (startLevel == -1 || line[startLevel] != "#") | ||
| return; | ||
|
|
||
| var startColumn = line.length; | ||
| var maxRow = session.getLength(); | ||
| var startRow = row; | ||
| var endRow = row; | ||
|
|
||
| while (++row < maxRow) { | ||
| line = session.getLine(row); | ||
| var level = line.search(re); | ||
|
|
||
| if (level == -1) | ||
| continue; | ||
|
|
||
| if (line[level] != "#") | ||
| break; | ||
|
|
||
| endRow = row; | ||
| } | ||
|
|
||
| if (endRow > startRow) { | ||
| var endColumn = session.getLine(endRow).length; | ||
| return new Range(startRow, startColumn, endRow, endColumn); | ||
| } | ||
| }; | ||
| this.getFoldWidget = function(session, foldStyle, row) { | ||
| var line = session.getLine(row); | ||
| var indent = line.search(/\S/); | ||
| var next = session.getLine(row + 1); | ||
| var prev = session.getLine(row - 1); | ||
| var prevIndent = prev.search(/\S/); | ||
| var nextIndent = next.search(/\S/); | ||
|
|
||
| if (indent == -1) { | ||
| session.foldWidgets[row - 1] = prevIndent!= -1 && prevIndent < nextIndent ? "start" : ""; | ||
| return ""; | ||
| } | ||
| if (prevIndent == -1) { | ||
| if (indent == nextIndent && line[indent] == "#" && next[indent] == "#") { | ||
| session.foldWidgets[row - 1] = ""; | ||
| session.foldWidgets[row + 1] = ""; | ||
| return "start"; | ||
| } | ||
| } else if (prevIndent == indent && line[indent] == "#" && prev[indent] == "#") { | ||
| if (session.getLine(row - 2).search(/\S/) == -1) { | ||
| session.foldWidgets[row - 1] = "start"; | ||
| session.foldWidgets[row + 1] = ""; | ||
| return ""; | ||
| } | ||
| } | ||
|
|
||
| if (prevIndent!= -1 && prevIndent < indent) | ||
| session.foldWidgets[row - 1] = "start"; | ||
| else | ||
| session.foldWidgets[row - 1] = ""; | ||
|
|
||
| if (indent < nextIndent) | ||
| return "start"; | ||
| else | ||
| return ""; | ||
| }; | ||
|
|
||
| }).call(FoldMode.prototype); | ||
|
|
||
| }); | ||
|
|
||
| ace.define("ace/mode/snippets",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/text_highlight_rules","ace/mode/folding/coffee"], function(require, exports, module) { | ||
| "use strict"; | ||
|
|
||
| var oop = require("../lib/oop"); | ||
| var TextMode = require("./text").Mode; | ||
| var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; | ||
|
|
||
| var SnippetHighlightRules = function() { | ||
|
|
||
| var builtins = "SELECTION|CURRENT_WORD|SELECTED_TEXT|CURRENT_LINE|LINE_INDEX|" + | ||
| "LINE_NUMBER|SOFT_TABS|TAB_SIZE|FILENAME|FILEPATH|FULLNAME"; | ||
|
|
||
| this.$rules = { | ||
| "start" : [ | ||
| {token:"constant.language.escape", regex: /\\[\$}`\\]/}, | ||
| {token:"keyword", regex: "\\$(?:TM_)?(?:" + builtins + ")\\b"}, | ||
| {token:"variable", regex: "\\$\\w+"}, | ||
| {onMatch: function(value, state, stack) { | ||
| if (stack[1]) | ||
| stack[1]++; | ||
| else | ||
| stack.unshift(state, 1); | ||
| return this.tokenName; | ||
| }, tokenName: "markup.list", regex: "\\${", next: "varDecl"}, | ||
| {onMatch: function(value, state, stack) { | ||
| if (!stack[1]) | ||
| return "text"; | ||
| stack[1]--; | ||
| if (!stack[1]) | ||
| stack.splice(0,2); | ||
| return this.tokenName; | ||
| }, tokenName: "markup.list", regex: "}"}, | ||
| {token: "doc.comment", regex:/^\${2}-{5,}$/} | ||
| ], | ||
| "varDecl" : [ | ||
| {regex: /\d+\b/, token: "constant.numeric"}, | ||
| {token:"keyword", regex: "(?:TM_)?(?:" + builtins + ")\\b"}, | ||
| {token:"variable", regex: "\\w+"}, | ||
| {regex: /:/, token: "punctuation.operator", next: "start"}, | ||
| {regex: /\//, token: "string.regex", next: "regexp"}, | ||
| {regex: "", next: "start"} | ||
| ], | ||
| "regexp" : [ | ||
| {regex: /\\./, token: "escape"}, | ||
| {regex: /\[/, token: "regex.start", next: "charClass"}, | ||
| {regex: "/", token: "string.regex", next: "format"}, | ||
| {"token": "string.regex", regex:"."} | ||
| ], | ||
| charClass : [ | ||
| {regex: "\\.", token: "escape"}, | ||
| {regex: "\\]", token: "regex.end", next: "regexp"}, | ||
| {"token": "string.regex", regex:"."} | ||
| ], | ||
| "format" : [ | ||
| {regex: /\\[ulULE]/, token: "keyword"}, | ||
| {regex: /\$\d+/, token: "variable"}, | ||
| {regex: "/[gim]*:?", token: "string.regex", next: "start"}, | ||
| {"token": "string", regex:"."} | ||
| ] | ||
| }; | ||
| }; | ||
| oop.inherits(SnippetHighlightRules, TextHighlightRules); | ||
|
|
||
| exports.SnippetHighlightRules = SnippetHighlightRules; | ||
|
|
||
| var SnippetGroupHighlightRules = function() { | ||
| this.$rules = { | ||
| "start" : [ | ||
| {token: "text", regex: "^\\t", next: "sn-start"}, | ||
| {token:"invalid", regex: /^ \s*/}, | ||
| {token:"comment", regex: /^#.*/}, | ||
| {token:"constant.language.escape", regex: "^regex ", next: "regex"}, | ||
| {token:"constant.language.escape", regex: "^(trigger|endTrigger|name|snippet|guard|endGuard|tabTrigger|key)\\b"} | ||
| ], | ||
| "regex" : [ | ||
| {token:"text", regex: "\\."}, | ||
| {token:"keyword", regex: "/"}, | ||
| {token:"empty", regex: "$", next: "start"} | ||
| ] | ||
| }; | ||
| this.embedRules(SnippetHighlightRules, "sn-", [ | ||
| {token: "text", regex: "^\\t", next: "sn-start"}, | ||
| {onMatch: function(value, state, stack) { | ||
| stack.splice(stack.length); | ||
| return this.tokenName; | ||
| }, tokenName: "text", regex: "^(?!\t)", next: "start"} | ||
| ]); | ||
|
|
||
| }; | ||
|
|
||
| oop.inherits(SnippetGroupHighlightRules, TextHighlightRules); | ||
|
|
||
| exports.SnippetGroupHighlightRules = SnippetGroupHighlightRules; | ||
|
|
||
| var FoldMode = require("./folding/coffee").FoldMode; | ||
|
|
||
| var Mode = function() { | ||
| this.HighlightRules = SnippetGroupHighlightRules; | ||
| this.foldingRules = new FoldMode(); | ||
| this.$behaviour = this.$defaultBehaviour; | ||
| }; | ||
| oop.inherits(Mode, TextMode); | ||
|
|
||
| (function() { | ||
| this.$indentWithTabs = true; | ||
| this.lineCommentStart = "#"; | ||
| this.$id = "ace/mode/snippets"; | ||
| }).call(Mode.prototype); | ||
| exports.Mode = Mode; | ||
|
|
||
|
|
||
| }); |
Oops, something went wrong.