diff --git a/lib/ace/keyboard/hash_handler.js b/lib/ace/keyboard/hash_handler.js index 2ef110da..f56532ee 100644 --- a/lib/ace/keyboard/hash_handler.js +++ b/lib/ace/keyboard/hash_handler.js @@ -89,6 +89,9 @@ function HashHandler(config, platform) { this.addCommands = function(commands) { commands && Object.keys(commands).forEach(function(name) { var command = commands[name]; + if (!command) + return; + if (typeof command === "string") return this.bindKey(command, name); diff --git a/lib/ace/keyboard/keybinding.js b/lib/ace/keyboard/keybinding.js index 9c54a947..2a1a2230 100644 --- a/lib/ace/keyboard/keybinding.js +++ b/lib/ace/keyboard/keybinding.js @@ -108,8 +108,11 @@ var KeyBinding = function(editor) { success = commands.exec(toExecute.command, this.$editor, toExecute.args, e); } // do not stop input events to not break repeating - if (success && e && hashId != -1 && toExecute.passEvent != true) + if (success && e && hashId != -1 && + toExecute.passEvent != true && toExecute.command.passEvent != true + ) { event.stopEvent(e); + } if (success) break; } diff --git a/lib/ace/mode/logiql_highlight_rules.js b/lib/ace/mode/logiql_highlight_rules.js index 17ceab0c..f4e505d8 100644 --- a/lib/ace/mode/logiql_highlight_rules.js +++ b/lib/ace/mode/logiql_highlight_rules.js @@ -53,7 +53,7 @@ var LogiQLHighlightRules = function() { //A single line comment. }, { token: 'constant.numeric', - regex: '\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?', + regex: '\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?[fd]?', //An integer constant. //Or a Real number. }, diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index 065d9783..a4c182dc 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -48,6 +48,10 @@ background-color: #2A2A2A } +.ace-tomorrow-night-bright .ace_stack { + background-color: rgb(66, 90, 44); +} + .ace-tomorrow-night-bright .ace_marker-layer .ace_selected-word { border: 1px solid #424242 } diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 613fd9a0..fc3e532f 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -44,6 +44,10 @@ border: 1px solid #6A6A6A } +.ace-tomorrow-night-bright .ace_stack { + background: rgb(66, 90, 44) +} + .ace-tomorrow-night-eighties .ace_marker-layer .ace_active-line { background: #393939 }