@openui5/sap.ui.codeeditor 1.120.7 → 1.121.0

package/src/sap/ui/codeeditor/js/ace/keybinding-emacs.js

@@ -1,25 +1,38 @@
-ace.define("ace/occur",[], function(require, exports, module) {
-"use strict";
-
+ace.define("ace/occur",["require","exports","module","ace/lib/oop","ace/search","ace/edit_session","ace/search_highlight","ace/lib/dom"], function(require, exports, module){"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var oop = require("./lib/oop");
-var Range = require("./range").Range;
 var Search = require("./search").Search;
 var EditSession = require("./edit_session").EditSession;
 var SearchHighlight = require("./search_highlight").SearchHighlight;
-function Occur() {}
-
-oop.inherits(Occur, Search);
-
-(function() {
-    this.enter = function(editor, options) {
-        if (!options.needle) return false;
+var Occur = /** @class */ (function (_super) {
+    __extends(Occur, _super);
+    function Occur() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Occur.prototype.enter = function (editor, options) {
+        if (!options.needle)
+            return false;
         var pos = editor.getCursorPosition();
         this.displayOccurContent(editor, options);
         var translatedPos = this.originalToOccurPosition(editor.session, pos);
         editor.moveCursorToPosition(translatedPos);
         return true;
     };
-    this.exit = function(editor, options) {
+    Occur.prototype.exit = function (editor, options) {
         var pos = options.translatePosition && editor.getCursorPosition();
         var translatedPos = pos && this.occurToOriginalPosition(editor.session, pos);
         this.displayOriginalContent(editor);
@@ -27,18 +40,15 @@ oop.inherits(Occur, Search);
             editor.moveCursorToPosition(translatedPos);
         return true;
     };
-
-    this.highlight = function(sess, regexp) {
-        var hl = sess.$occurHighlight = sess.$occurHighlight || sess.addDynamicMarker(
-                new SearchHighlight(null, "ace_occur-highlight", "text"));
+    Occur.prototype.highlight = function (sess, regexp) {
+        var hl = sess.$occurHighlight = sess.$occurHighlight || sess.addDynamicMarker(new SearchHighlight(null, "ace_occur-highlight", "text"));
         hl.setRegexp(regexp);
         sess._emit("changeBackMarker"); // force highlight layer redraw
     };
-
-    this.displayOccurContent = function(editor, options) {
+    Occur.prototype.displayOccurContent = function (editor, options) {
         this.$originalSession = editor.session;
         var found = this.matchingLines(editor.session, options);
-        var lines = found.map(function(foundLine) { return foundLine.content; });
+        var lines = found.map(function (foundLine) { return foundLine.content; });
         var occurSession = new EditSession(lines.join('\n'));
         occurSession.$occur = this;
         occurSession.$occurMatchingLines = found;
@@ -48,44 +58,43 @@ oop.inherits(Occur, Search);
         this.highlight(occurSession, options.re);
         occurSession._emit('changeBackMarker');
     };
-
-    this.displayOriginalContent = function(editor) {
+    Occur.prototype.displayOriginalContent = function (editor) {
         editor.setSession(this.$originalSession);
         this.$originalSession.$useEmacsStyleLineStart = this.$useEmacsStyleLineStart;
     };
-    this.originalToOccurPosition = function(session, pos) {
+    Occur.prototype.originalToOccurPosition = function (session, pos) {
         var lines = session.$occurMatchingLines;
-        var nullPos = {row: 0, column: 0};
-        if (!lines) return nullPos;
+        var nullPos = { row: 0, column: 0 };
+        if (!lines)
+            return nullPos;
         for (var i = 0; i < lines.length; i++) {
             if (lines[i].row === pos.row)
-                return {row: i, column: pos.column};
+                return { row: i, column: pos.column };
         }
         return nullPos;
     };
-    this.occurToOriginalPosition = function(session, pos) {
+    Occur.prototype.occurToOriginalPosition = function (session, pos) {
         var lines = session.$occurMatchingLines;
         if (!lines || !lines[pos.row])
             return pos;
-        return {row: lines[pos.row].row, column: pos.column};
+        return { row: lines[pos.row].row, column: pos.column };
     };
-
-    this.matchingLines = function(session, options) {
+    Occur.prototype.matchingLines = function (session, options) {
         options = oop.mixin({}, options);
-        if (!session || !options.needle) return [];
+        if (!session || !options.needle)
+            return [];
         var search = new Search();
         search.set(options);
-        return search.findAll(session).reduce(function(lines, range) {
+        return search.findAll(session).reduce(function (lines, range) {
             var row = range.start.row;
-            var last = lines[lines.length-1];
+            var last = lines[lines.length - 1];
             return last && last.row === row ?
                 lines :
-                lines.concat({row: row, content: session.getLine(row)});
+                lines.concat({ row: row, content: session.getLine(row) });
         }, []);
     };
-
-}).call(Occur.prototype);
-
+    return Occur;
+}(Search));
 var dom = require('./lib/dom');
 dom.importCssString(".ace_occur-highlight {\n\
     border-radius: 4px;\n\
@@ -99,18 +108,14 @@ dom.importCssString(".ace_occur-highlight {\n\
     background-color: rgb(80, 140, 85);\n\
     box-shadow: 0 0 4px rgb(60, 120, 70);\n\
 }\n", "incremental-occur-highlighting", false);
-
 exports.Occur = Occur;
 
 });
 
-ace.define("ace/commands/occur_commands",[], function(require, exports, module) {
-
-var config = require("../config"),
-    Occur = require("../occur").Occur;
+ace.define("ace/commands/occur_commands",["require","exports","module","ace/config","ace/occur","ace/keyboard/hash_handler","ace/lib/oop"], function(require, exports, module){var config = require("../config"), Occur = require("../occur").Occur;
 var occurStartCommand = {
     name: "occur",
-    exec: function(editor, options) {
+    exec: function (editor, options) {
         var alreadyInOccur = !!editor.session.$occur;
         var occurSessionActive = new Occur().enter(editor, options);
         if (occurSessionActive && !alreadyInOccur)
@@ -118,214 +123,195 @@ var occurStartCommand = {
     },
     readOnly: true
 };
-
 var occurCommands = [{
-    name: "occurexit",
-    bindKey: 'esc|Ctrl-G',
-    exec: function(editor) {
-        var occur = editor.session.$occur;
-        if (!occur) return;
-        occur.exit(editor, {});
-        if (!editor.session.$occur) OccurKeyboardHandler.uninstallFrom(editor);
-    },
-    readOnly: true
-}, {
-    name: "occuraccept",
-    bindKey: 'enter',
-    exec: function(editor) {
-        var occur = editor.session.$occur;
-        if (!occur) return;
-        occur.exit(editor, {translatePosition: true});
-        if (!editor.session.$occur) OccurKeyboardHandler.uninstallFrom(editor);
-    },
-    readOnly: true
-}];
-
+        name: "occurexit",
+        bindKey: 'esc|Ctrl-G',
+        exec: function (editor) {
+            var occur = editor.session.$occur;
+            if (!occur)
+                return;
+            occur.exit(editor, {});
+            if (!editor.session.$occur)
+                OccurKeyboardHandler.uninstallFrom(editor);
+        },
+        readOnly: true
+    }, {
+        name: "occuraccept",
+        bindKey: 'enter',
+        exec: function (editor) {
+            var occur = editor.session.$occur;
+            if (!occur)
+                return;
+            occur.exit(editor, { translatePosition: true });
+            if (!editor.session.$occur)
+                OccurKeyboardHandler.uninstallFrom(editor);
+        },
+        readOnly: true
+    }];
 var HashHandler = require("../keyboard/hash_handler").HashHandler;
 var oop = require("../lib/oop");
-
-
-function OccurKeyboardHandler() {}
-
+function OccurKeyboardHandler() { }
 oop.inherits(OccurKeyboardHandler, HashHandler);
-
-(function() {
-
+(function () {
     this.isOccurHandler = true;
-
-    this.attach = function(editor) {
+    this.attach = function (editor) {
         HashHandler.call(this, occurCommands, editor.commands.platform);
         this.$editor = editor;
     };
-
     var handleKeyboard$super = this.handleKeyboard;
-    this.handleKeyboard = function(data, hashId, key, keyCode) {
+    this.handleKeyboard = function (data, hashId, key, keyCode) {
         var cmd = handleKeyboard$super.call(this, data, hashId, key, keyCode);
         return (cmd && cmd.command) ? cmd : undefined;
     };
-
 }).call(OccurKeyboardHandler.prototype);
-
-OccurKeyboardHandler.installIn = function(editor) {
+OccurKeyboardHandler.installIn = function (editor) {
     var handler = new this();
     editor.keyBinding.addKeyboardHandler(handler);
     editor.commands.addCommands(occurCommands);
 };
-
-OccurKeyboardHandler.uninstallFrom = function(editor) {
+OccurKeyboardHandler.uninstallFrom = function (editor) {
     editor.commands.removeCommands(occurCommands);
     var handler = editor.getKeyboardHandler();
     if (handler.isOccurHandler)
         editor.keyBinding.removeKeyboardHandler(handler);
 };
-
 exports.occurStartCommand = occurStartCommand;
 
 });
 
-ace.define("ace/commands/incremental_search_commands",[], function(require, exports, module) {
-
-var config = require("../config");
+ace.define("ace/commands/incremental_search_commands",["require","exports","module","ace/config","ace/lib/oop","ace/keyboard/hash_handler","ace/commands/occur_commands"], function(require, exports, module){var config = require("../config");
 var oop = require("../lib/oop");
 var HashHandler = require("../keyboard/hash_handler").HashHandler;
 var occurStartCommand = require("./occur_commands").occurStartCommand;
 exports.iSearchStartCommands = [{
-    name: "iSearch",
-    bindKey: {win: "Ctrl-F", mac: "Command-F"},
-    exec: function(editor, options) {
-        config.loadModule(["core", "ace/incremental_search"], function(e) {
-            var iSearch = e.iSearch = e.iSearch || new e.IncrementalSearch();
-            iSearch.activate(editor, options.backwards);
-            if (options.jumpToFirstMatch) iSearch.next(options);
-        });
-    },
-    readOnly: true
-}, {
-    name: "iSearchBackwards",
-    exec: function(editor, jumpToNext) { editor.execCommand('iSearch', {backwards: true}); },
-    readOnly: true
-}, {
-    name: "iSearchAndGo",
-    bindKey: {win: "Ctrl-K", mac: "Command-G"},
-    exec: function(editor, jumpToNext) { editor.execCommand('iSearch', {jumpToFirstMatch: true, useCurrentOrPrevSearch: true}); },
-    readOnly: true
-}, {
-    name: "iSearchBackwardsAndGo",
-    bindKey: {win: "Ctrl-Shift-K", mac: "Command-Shift-G"},
-    exec: function(editor) { editor.execCommand('iSearch', {jumpToFirstMatch: true, backwards: true, useCurrentOrPrevSearch: true}); },
-    readOnly: true
-}];
+        name: "iSearch",
+        bindKey: { win: "Ctrl-F", mac: "Command-F" },
+        exec: function (editor, options) {
+            config.loadModule(["core", "ace/incremental_search"], function (e) {
+                var iSearch = e.iSearch = e.iSearch || new e.IncrementalSearch();
+                iSearch.activate(editor, options.backwards);
+                if (options.jumpToFirstMatch)
+                    iSearch.next(options);
+            });
+        },
+        readOnly: true
+    }, {
+        name: "iSearchBackwards",
+        exec: function (editor, jumpToNext) { editor.execCommand('iSearch', { backwards: true }); },
+        readOnly: true
+    }, {
+        name: "iSearchAndGo",
+        bindKey: { win: "Ctrl-K", mac: "Command-G" },
+        exec: function (editor, jumpToNext) { editor.execCommand('iSearch', { jumpToFirstMatch: true, useCurrentOrPrevSearch: true }); },
+        readOnly: true
+    }, {
+        name: "iSearchBackwardsAndGo",
+        bindKey: { win: "Ctrl-Shift-K", mac: "Command-Shift-G" },
+        exec: function (editor) { editor.execCommand('iSearch', { jumpToFirstMatch: true, backwards: true, useCurrentOrPrevSearch: true }); },
+        readOnly: true
+    }];
 exports.iSearchCommands = [{
-    name: "restartSearch",
-    bindKey: {win: "Ctrl-F", mac: "Command-F"},
-    exec: function(iSearch) {
-        iSearch.cancelSearch(true);
-    }
-}, {
-    name: "searchForward",
-    bindKey: {win: "Ctrl-S|Ctrl-K", mac: "Ctrl-S|Command-G"},
-    exec: function(iSearch, options) {
-        options.useCurrentOrPrevSearch = true;
-        iSearch.next(options);
-    }
-}, {
-    name: "searchBackward",
-    bindKey: {win: "Ctrl-R|Ctrl-Shift-K", mac: "Ctrl-R|Command-Shift-G"},
-    exec: function(iSearch, options) {
-        options.useCurrentOrPrevSearch = true;
-        options.backwards = true;
-        iSearch.next(options);
-    }
-}, {
-    name: "extendSearchTerm",
-    exec: function(iSearch, string) {
-        iSearch.addString(string);
-    }
-}, {
-    name: "extendSearchTermSpace",
-    bindKey: "space",
-    exec: function(iSearch) { iSearch.addString(' '); }
-}, {
-    name: "shrinkSearchTerm",
-    bindKey: "backspace",
-    exec: function(iSearch) {
-        iSearch.removeChar();
-    }
-}, {
-    name: 'confirmSearch',
-    bindKey: 'return',
-    exec: function(iSearch) { iSearch.deactivate(); }
-}, {
-    name: 'cancelSearch',
-    bindKey: 'esc|Ctrl-G',
-    exec: function(iSearch) { iSearch.deactivate(true); }
-}, {
-    name: 'occurisearch',
-    bindKey: 'Ctrl-O',
-    exec: function(iSearch) {
-        var options = oop.mixin({}, iSearch.$options);
-        iSearch.deactivate();
-        occurStartCommand.exec(iSearch.$editor, options);
-    }
-}, {
-    name: "yankNextWord",
-    bindKey: "Ctrl-w",
-    exec: function(iSearch) {
-        var ed = iSearch.$editor,
-            range = ed.selection.getRangeOfMovements(function(sel) { sel.moveCursorWordRight(); }),
-            string = ed.session.getTextRange(range);
-        iSearch.addString(string);
-    }
-}, {
-    name: "yankNextChar",
-    bindKey: "Ctrl-Alt-y",
-    exec: function(iSearch) {
-        var ed = iSearch.$editor,
-            range = ed.selection.getRangeOfMovements(function(sel) { sel.moveCursorRight(); }),
-            string = ed.session.getTextRange(range);
-        iSearch.addString(string);
-    }
-}, {
-    name: 'recenterTopBottom',
-    bindKey: 'Ctrl-l',
-    exec: function(iSearch) { iSearch.$editor.execCommand('recenterTopBottom'); }
-}, {
-    name: 'selectAllMatches',
-    bindKey: 'Ctrl-space',
-    exec: function(iSearch) {
-        var ed = iSearch.$editor,
-            hl = ed.session.$isearchHighlight,
-            ranges = hl && hl.cache ? hl.cache
-                .reduce(function(ranges, ea) {
-                    return ranges.concat(ea ? ea : []); }, []) : [];
-        iSearch.deactivate(false);
-        ranges.forEach(ed.selection.addRange.bind(ed.selection));
-    }
-}, {
-    name: 'searchAsRegExp',
-    bindKey: 'Alt-r',
-    exec: function(iSearch) {
-        iSearch.convertNeedleToRegExp();
-    }
-}].map(function(cmd) {
+        name: "restartSearch",
+        bindKey: { win: "Ctrl-F", mac: "Command-F" },
+        exec: function (iSearch) {
+            iSearch.cancelSearch(true);
+        }
+    }, {
+        name: "searchForward",
+        bindKey: { win: "Ctrl-S|Ctrl-K", mac: "Ctrl-S|Command-G" },
+        exec: function (iSearch, options) {
+            options.useCurrentOrPrevSearch = true;
+            iSearch.next(options);
+        }
+    }, {
+        name: "searchBackward",
+        bindKey: { win: "Ctrl-R|Ctrl-Shift-K", mac: "Ctrl-R|Command-Shift-G" },
+        exec: function (iSearch, options) {
+            options.useCurrentOrPrevSearch = true;
+            options.backwards = true;
+            iSearch.next(options);
+        }
+    }, {
+        name: "extendSearchTerm",
+        exec: function (iSearch, string) {
+            iSearch.addString(string);
+        }
+    }, {
+        name: "extendSearchTermSpace",
+        bindKey: "space",
+        exec: function (iSearch) { iSearch.addString(' '); }
+    }, {
+        name: "shrinkSearchTerm",
+        bindKey: "backspace",
+        exec: function (iSearch) {
+            iSearch.removeChar();
+        }
+    }, {
+        name: 'confirmSearch',
+        bindKey: 'return',
+        exec: function (iSearch) { iSearch.deactivate(); }
+    }, {
+        name: 'cancelSearch',
+        bindKey: 'esc|Ctrl-G',
+        exec: function (iSearch) { iSearch.deactivate(true); }
+    }, {
+        name: 'occurisearch',
+        bindKey: 'Ctrl-O',
+        exec: function (iSearch) {
+            var options = oop.mixin({}, iSearch.$options);
+            iSearch.deactivate();
+            occurStartCommand.exec(iSearch.$editor, options);
+        }
+    }, {
+        name: "yankNextWord",
+        bindKey: "Ctrl-w",
+        exec: function (iSearch) {
+            var ed = iSearch.$editor, range = ed.selection.getRangeOfMovements(function (sel) { sel.moveCursorWordRight(); }), string = ed.session.getTextRange(range);
+            iSearch.addString(string);
+        }
+    }, {
+        name: "yankNextChar",
+        bindKey: "Ctrl-Alt-y",
+        exec: function (iSearch) {
+            var ed = iSearch.$editor, range = ed.selection.getRangeOfMovements(function (sel) { sel.moveCursorRight(); }), string = ed.session.getTextRange(range);
+            iSearch.addString(string);
+        }
+    }, {
+        name: 'recenterTopBottom',
+        bindKey: 'Ctrl-l',
+        exec: function (iSearch) { iSearch.$editor.execCommand('recenterTopBottom'); }
+    }, {
+        name: 'selectAllMatches',
+        bindKey: 'Ctrl-space',
+        exec: function (iSearch) {
+            var ed = iSearch.$editor, hl = ed.session.$isearchHighlight, ranges = hl && hl.cache ? hl.cache
+                .reduce(function (ranges, ea) {
+                return ranges.concat(ea ? ea : []);
+            }, []) : [];
+            iSearch.deactivate(false);
+            ranges.forEach(ed.selection.addRange.bind(ed.selection));
+        }
+    }, {
+        name: 'searchAsRegExp',
+        bindKey: 'Alt-r',
+        exec: function (iSearch) {
+            iSearch.convertNeedleToRegExp();
+        }
+    }].map(function (cmd) {
     cmd.readOnly = true;
     cmd.isIncrementalSearchCommand = true;
     cmd.scrollIntoView = "animate-cursor";
     return cmd;
 });
-
 function IncrementalSearchKeyboardHandler(iSearch) {
     this.$iSearch = iSearch;
 }
-
 oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
-
-(function() {
-
-    this.attach = function(editor) {
+(function () {
+    this.attach = function (editor) {
         var iSearch = this.$iSearch;
         HashHandler.call(this, exports.iSearchCommands, editor.commands.platform);
-        this.$commandExecHandler = editor.commands.on('exec', function(e) {
+        this.$commandExecHandler = editor.commands.on('exec', function (e) {
             if (!e.command.isIncrementalSearchCommand)
                 return iSearch.deactivate();
             e.stopPropagation();
@@ -337,89 +323,97 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
             return result;
         });
     };
-
-    this.detach = function(editor) {
-        if (!this.$commandExecHandler) return;
+    this.detach = function (editor) {
+        if (!this.$commandExecHandler)
+            return;
         editor.commands.off('exec', this.$commandExecHandler);
         delete this.$commandExecHandler;
     };
-
     var handleKeyboard$super = this.handleKeyboard;
-    this.handleKeyboard = function(data, hashId, key, keyCode) {
-        if (((hashId === 1/*ctrl*/ || hashId === 8/*command*/) && key === 'v')
-         || (hashId === 1/*ctrl*/ && key === 'y')) return null;
+    this.handleKeyboard = function (data, hashId, key, keyCode) {
+        if (((hashId === 1 /*ctrl*/ || hashId === 8 /*command*/) && key === 'v')
+            || (hashId === 1 /*ctrl*/ && key === 'y'))
+            return null;
         var cmd = handleKeyboard$super.call(this, data, hashId, key, keyCode);
-        if (cmd && cmd.command) { return cmd; }
+        if (cmd && cmd.command) {
+            return cmd;
+        }
         if (hashId == -1) {
             var extendCmd = this.commands.extendSearchTerm;
-            if (extendCmd) { return {command: extendCmd, args: key}; }
+            if (extendCmd) {
+                return { command: extendCmd, args: key };
+            }
         }
         return false;
     };
-
 }).call(IncrementalSearchKeyboardHandler.prototype);
-
-
 exports.IncrementalSearchKeyboardHandler = IncrementalSearchKeyboardHandler;
 
 });
 
-ace.define("ace/incremental_search",[], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
+ace.define("ace/incremental_search",["require","exports","module","ace/range","ace/search","ace/search_highlight","ace/commands/incremental_search_commands","ace/lib/dom","ace/commands/command_manager","ace/editor","ace/config"], function(require, exports, module){"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var Range = require("./range").Range;
 var Search = require("./search").Search;
 var SearchHighlight = require("./search_highlight").SearchHighlight;
 var iSearchCommandModule = require("./commands/incremental_search_commands");
 var ISearchKbd = iSearchCommandModule.IncrementalSearchKeyboardHandler;
-function IncrementalSearch() {
-    this.$options = {wrap: false, skipCurrent: false};
-    this.$keyboardHandler = new ISearchKbd(this);
-}
-
-oop.inherits(IncrementalSearch, Search);
-
 function isRegExp(obj) {
     return obj instanceof RegExp;
 }
-
 function regExpToObject(re) {
-    var string = String(re),
-        start = string.indexOf('/'),
-        flagStart = string.lastIndexOf('/');
+    var string = String(re), start = string.indexOf('/'), flagStart = string.lastIndexOf('/');
     return {
-        expression: string.slice(start+1, flagStart),
-        flags: string.slice(flagStart+1)
+        expression: string.slice(start + 1, flagStart),
+        flags: string.slice(flagStart + 1)
     };
 }
-
 function stringToRegExp(string, flags) {
     try {
         return new RegExp(string, flags);
-    } catch (e) { return string; }
+    }
+    catch (e) {
+        return string;
+    }
 }
-
 function objectToRegExp(obj) {
     return stringToRegExp(obj.expression, obj.flags);
 }
-
-(function() {
-
-    this.activate = function(editor, backwards) {
+var IncrementalSearch = /** @class */ (function (_super) {
+    __extends(IncrementalSearch, _super);
+    function IncrementalSearch() {
+        var _this = _super.call(this) || this;
+        _this.$options = { wrap: false, skipCurrent: false };
+        _this.$keyboardHandler = new ISearchKbd(_this);
+        return _this;
+    }
+    IncrementalSearch.prototype.activate = function (editor, backwards) {
         this.$editor = editor;
         this.$startPos = this.$currentPos = editor.getCursorPosition();
         this.$options.needle = '';
         this.$options.backwards = backwards;
         editor.keyBinding.addKeyboardHandler(this.$keyboardHandler);
-        this.$originalEditorOnPaste = editor.onPaste; 
+        this.$originalEditorOnPaste = editor.onPaste;
         editor.onPaste = this.onPaste.bind(this);
         this.$mousedownHandler = editor.on('mousedown', this.onMouseDown.bind(this));
         this.selectionFix(editor);
         this.statusMessage(true);
     };
-
-    this.deactivate = function(reset) {
+    IncrementalSearch.prototype.deactivate = function (reset) {
         this.cancelSearch(reset);
         var editor = this.$editor;
         editor.keyBinding.removeKeyboardHandler(this.$keyboardHandler);
@@ -430,37 +424,33 @@ function objectToRegExp(obj) {
         editor.onPaste = this.$originalEditorOnPaste;
         this.message('');
     };
-
-    this.selectionFix = function(editor) {
+    IncrementalSearch.prototype.selectionFix = function (editor) {
         if (editor.selection.isEmpty() && !editor.session.$emacsMark) {
             editor.clearSelection();
         }
     };
-
-    this.highlight = function(regexp) {
-        var sess = this.$editor.session,
-            hl = sess.$isearchHighlight = sess.$isearchHighlight || sess.addDynamicMarker(
-                new SearchHighlight(null, "ace_isearch-result", "text"));
+    IncrementalSearch.prototype.highlight = function (regexp) {
+        var sess = this.$editor.session, hl = sess.$isearchHighlight = sess.$isearchHighlight || sess.addDynamicMarker(new SearchHighlight(null, "ace_isearch-result", "text"));
         hl.setRegexp(regexp);
         sess._emit("changeBackMarker"); // force highlight layer redraw
     };
-
-    this.cancelSearch = function(reset) {
+    IncrementalSearch.prototype.cancelSearch = function (reset) {
         var e = this.$editor;
         this.$prevNeedle = this.$options.needle;
         this.$options.needle = '';
         if (reset) {
             e.moveCursorToPosition(this.$startPos);
             this.$currentPos = this.$startPos;
-        } else {
+        }
+        else {
             e.pushEmacsMark && e.pushEmacsMark(this.$startPos, false);
         }
         this.highlight(null);
         return Range.fromPoints(this.$currentPos, this.$currentPos);
     };
-
-    this.highlightAndFindWithNeedle = function(moveToNext, needleUpdateFunc) {
-        if (!this.$editor) return null;
+    IncrementalSearch.prototype.highlightAndFindWithNeedle = function (moveToNext, needleUpdateFunc) {
+        if (!this.$editor)
+            return null;
         var options = this.$options;
         if (needleUpdateFunc) {
             options.needle = needleUpdateFunc.call(this, options.needle || '') || '';
@@ -470,113 +460,86 @@ function objectToRegExp(obj) {
             return this.cancelSearch(true);
         }
         options.start = this.$currentPos;
-        var session = this.$editor.session,
-            found = this.find(session),
-            shouldSelect = this.$editor.emacsMark ?
-                !!this.$editor.emacsMark() : !this.$editor.selection.isEmpty();
+        var session = this.$editor.session, found = this.find(session), shouldSelect = this.$editor.emacsMark ?
+            !!this.$editor.emacsMark() : !this.$editor.selection.isEmpty();
         if (found) {
-            if (options.backwards) found = Range.fromPoints(found.end, found.start);
+            if (options.backwards)
+                found = Range.fromPoints(found.end, found.start);
             this.$editor.selection.setRange(Range.fromPoints(shouldSelect ? this.$startPos : found.end, found.end));
-            if (moveToNext) this.$currentPos = found.end;
+            if (moveToNext)
+                this.$currentPos = found.end;
             this.highlight(options.re);
         }
-
         this.statusMessage(found);
-
         return found;
     };
-
-    this.addString = function(s) {
-        return this.highlightAndFindWithNeedle(false, function(needle) {
+    IncrementalSearch.prototype.addString = function (s) {
+        return this.highlightAndFindWithNeedle(false, function (needle) {
             if (!isRegExp(needle))
-              return needle + s;
+                return needle + s;
             var reObj = regExpToObject(needle);
             reObj.expression += s;
             return objectToRegExp(reObj);
         });
     };
-
-    this.removeChar = function(c) {
-        return this.highlightAndFindWithNeedle(false, function(needle) {
+    IncrementalSearch.prototype.removeChar = function (c) {
+        return this.highlightAndFindWithNeedle(false, function (needle) {
             if (!isRegExp(needle))
-              return needle.substring(0, needle.length-1);
+                return needle.substring(0, needle.length - 1);
             var reObj = regExpToObject(needle);
-            reObj.expression = reObj.expression.substring(0, reObj.expression.length-1);
+            reObj.expression = reObj.expression.substring(0, reObj.expression.length - 1);
             return objectToRegExp(reObj);
         });
     };
-
-    this.next = function(options) {
+    IncrementalSearch.prototype.next = function (options) {
         options = options || {};
         this.$options.backwards = !!options.backwards;
         this.$currentPos = this.$editor.getCursorPosition();
-        return this.highlightAndFindWithNeedle(true, function(needle) {
+        return this.highlightAndFindWithNeedle(true, function (needle) {
             return options.useCurrentOrPrevSearch && needle.length === 0 ?
                 this.$prevNeedle || '' : needle;
         });
     };
-
-    this.onMouseDown = function(evt) {
+    IncrementalSearch.prototype.onMouseDown = function (evt) {
         this.deactivate();
         return true;
     };
-
-    this.onPaste = function(text) {
+    IncrementalSearch.prototype.onPaste = function (text) {
         this.addString(text);
     };
-
-    this.convertNeedleToRegExp = function() {
-        return this.highlightAndFindWithNeedle(false, function(needle) {
+    IncrementalSearch.prototype.convertNeedleToRegExp = function () {
+        return this.highlightAndFindWithNeedle(false, function (needle) {
             return isRegExp(needle) ? needle : stringToRegExp(needle, 'ig');
         });
     };
-
-    this.convertNeedleToString = function() {
-        return this.highlightAndFindWithNeedle(false, function(needle) {
+    IncrementalSearch.prototype.convertNeedleToString = function () {
+        return this.highlightAndFindWithNeedle(false, function (needle) {
             return isRegExp(needle) ? regExpToObject(needle).expression : needle;
         });
     };
-
-    this.statusMessage = function(found) {
+    IncrementalSearch.prototype.statusMessage = function (found) {
         var options = this.$options, msg = '';
         msg += options.backwards ? 'reverse-' : '';
         msg += 'isearch: ' + options.needle;
         msg += found ? '' : ' (not found)';
         this.message(msg);
     };
-
-    this.message = function(msg) {
+    IncrementalSearch.prototype.message = function (msg) {
         if (this.$editor.showCommandLine) {
             this.$editor.showCommandLine(msg);
             this.$editor.focus();
         }
     };
-
-}).call(IncrementalSearch.prototype);
-
-
+    return IncrementalSearch;
+}(Search));
 exports.IncrementalSearch = IncrementalSearch;
-
 var dom = require('./lib/dom');
-dom.importCssString("\
-.ace_marker-layer .ace_isearch-result {\
-  position: absolute;\
-  z-index: 6;\
-  box-sizing: border-box;\
-}\
-div.ace_isearch-result {\
-  border-radius: 4px;\
-  background-color: rgba(255, 200, 0, 0.5);\
-  box-shadow: 0 0 4px rgb(255, 200, 0);\
-}\
-.ace_dark div.ace_isearch-result {\
-  background-color: rgb(100, 110, 160);\
-  box-shadow: 0 0 4px rgb(80, 90, 140);\
-}", "incremental-search-highlighting", false);
+dom.importCssString("\n.ace_marker-layer .ace_isearch-result {\n  position: absolute;\n  z-index: 6;\n  box-sizing: border-box;\n}\ndiv.ace_isearch-result {\n  border-radius: 4px;\n  background-color: rgba(255, 200, 0, 0.5);\n  box-shadow: 0 0 4px rgb(255, 200, 0);\n}\n.ace_dark div.ace_isearch-result {\n  background-color: rgb(100, 110, 160);\n  box-shadow: 0 0 4px rgb(80, 90, 140);\n}", "incremental-search-highlighting", false);
 var commands = require("./commands/command_manager");
-(function() {
-    this.setupIncrementalSearch = function(editor, val) {
-        if (this.usesIncrementalSearch == val) return;
+(function () {
+    this.setupIncrementalSearch = function (editor, val) {
+        if (this.usesIncrementalSearch == val)
+            return;
         this.usesIncrementalSearch = val;
         var iSearchCommands = iSearchCommandModule.iSearchStartCommands;
         var method = val ? 'addCommands' : 'removeCommands';
@@ -586,114 +549,72 @@ var commands = require("./commands/command_manager");
 var Editor = require("./editor").Editor;
 require("./config").defineOptions(Editor.prototype, "editor", {
     useIncrementalSearch: {
-        set: function(val) {
-            this.keyBinding.$handlers.forEach(function(handler) {
+        set: function (val) {
+            this.keyBinding.$handlers.forEach(function (handler) {
                 if (handler.setupIncrementalSearch) {
                     handler.setupIncrementalSearch(this, val);
                 }
             });
-            this._emit('incrementalSearchSettingChanged', {isEnabled: val});
+            this._emit('incrementalSearchSettingChanged', { isEnabled: val });
         }
     }
 });
 
 });
 
-ace.define("ace/keyboard/emacs",[], function(require, exports, module) {
-"use strict";
-
+ace.define("ace/keyboard/emacs",["require","exports","module","ace/lib/dom","ace/incremental_search","ace/commands/incremental_search_commands","ace/keyboard/hash_handler","ace/lib/keys"], function(require, exports, module){"use strict";
 var dom = require("../lib/dom");
 require("../incremental_search");
 var iSearchCommandModule = require("../commands/incremental_search_commands");
-
-
 var HashHandler = require("./hash_handler").HashHandler;
 exports.handler = new HashHandler();
-
 exports.handler.isEmacs = true;
 exports.handler.$id = "ace/keyboard/emacs";
-
-var initialized = false;
+dom.importCssString("\n.emacs-mode .ace_cursor{\n    border: 1px rgba(50,250,50,0.8) solid!important;\n    box-sizing: border-box!important;\n    background-color: rgba(0,250,0,0.9);\n    opacity: 0.5;\n}\n.emacs-mode .ace_hidden-cursors .ace_cursor{\n    opacity: 1;\n    background-color: transparent;\n}\n.emacs-mode .ace_overwrite-cursors .ace_cursor {\n    opacity: 1;\n    background-color: transparent;\n    border-width: 0 0 2px 2px !important;\n}\n.emacs-mode .ace_text-layer {\n    z-index: 4\n}\n.emacs-mode .ace_cursor-layer {\n    z-index: 2\n}", 'emacsMode');
 var $formerLongWords;
 var $formerLineStart;
-
-exports.handler.attach = function(editor) {
-    if (!initialized) {
-        initialized = true;
-        dom.importCssString('\
-            .emacs-mode .ace_cursor{\
-                border: 1px rgba(50,250,50,0.8) solid!important;\
-                box-sizing: border-box!important;\
-                background-color: rgba(0,250,0,0.9);\
-                opacity: 0.5;\
-            }\
-            .emacs-mode .ace_hidden-cursors .ace_cursor{\
-                opacity: 1;\
-                background-color: transparent;\
-            }\
-            .emacs-mode .ace_overwrite-cursors .ace_cursor {\
-                opacity: 1;\
-                background-color: transparent;\
-                border-width: 0 0 2px 2px !important;\
-            }\
-            .emacs-mode .ace_text-layer {\
-                z-index: 4\
-            }\
-            .emacs-mode .ace_cursor-layer {\
-                z-index: 2\
-            }', 'emacsMode'
-        );
-    }
+exports.handler.attach = function (editor) {
     $formerLongWords = editor.session.$selectLongWords;
     editor.session.$selectLongWords = true;
     $formerLineStart = editor.session.$useEmacsStyleLineStart;
     editor.session.$useEmacsStyleLineStart = true;
-
     editor.session.$emacsMark = null; // the active mark
     editor.session.$emacsMarkRing = editor.session.$emacsMarkRing || [];
-
-    editor.emacsMark = function() {
+    editor.emacsMark = function () {
         return this.session.$emacsMark;
     };
-
-    editor.setEmacsMark = function(p) {
+    editor.setEmacsMark = function (p) {
         this.session.$emacsMark = p;
     };
-
-    editor.pushEmacsMark = function(p, activate) {
+    editor.pushEmacsMark = function (p, activate) {
         var prevMark = this.session.$emacsMark;
         if (prevMark)
             this.session.$emacsMarkRing.push(prevMark);
-        if (!p || activate) this.setEmacsMark(p);
-        else this.session.$emacsMarkRing.push(p);
+        if (!p || activate)
+            this.setEmacsMark(p);
+        else
+            this.session.$emacsMarkRing.push(p);
     };
-
-    editor.popEmacsMark = function() {
+    editor.popEmacsMark = function () {
         var mark = this.emacsMark();
-        if (mark) { this.setEmacsMark(null); return mark; }
+        if (mark) {
+            this.setEmacsMark(null);
+            return mark;
+        }
         return this.session.$emacsMarkRing.pop();
     };
-
-    editor.getLastEmacsMark = function(p) {
+    editor.getLastEmacsMark = function (p) {
         return this.session.$emacsMark || this.session.$emacsMarkRing.slice(-1)[0];
     };
-
-    editor.emacsMarkForSelection = function(replacement) {
-        var sel = this.selection,
-            multiRangeLength = this.multiSelect ?
-                this.multiSelect.getAllRanges().length : 1,
-            selIndex = sel.index || 0,
-            markRing = this.session.$emacsMarkRing,
-            markIndex = markRing.length - (multiRangeLength - selIndex),
-            lastMark = markRing[markIndex] || sel.anchor;
+    editor.emacsMarkForSelection = function (replacement) {
+        var sel = this.selection, multiRangeLength = this.multiSelect ?
+            this.multiSelect.getAllRanges().length : 1, selIndex = sel.index || 0, markRing = this.session.$emacsMarkRing, markIndex = markRing.length - (multiRangeLength - selIndex), lastMark = markRing[markIndex] || sel.anchor;
         if (replacement) {
-            markRing.splice(markIndex, 1,
-                "row" in replacement && "column" in replacement ?
-                    replacement : undefined);
+            markRing.splice(markIndex, 1, "row" in replacement && "column" in replacement ?
+                replacement : undefined);
         }
         return lastMark;
     };
-
     editor.on("click", $resetMarkMode);
     editor.on("changeSession", $kbSessionChange);
     editor.renderer.$blockCursor = true;
@@ -704,8 +625,7 @@ exports.handler.attach = function(editor) {
     editor.on('copy', this.onCopy);
     editor.on('paste', this.onPaste);
 };
-
-exports.handler.detach = function(editor) {
+exports.handler.detach = function (editor) {
     editor.renderer.$blockCursor = false;
     editor.session.$selectLongWords = $formerLongWords;
     editor.session.$useEmacsStyleLineStart = $formerLineStart;
@@ -717,85 +637,76 @@ exports.handler.detach = function(editor) {
     editor.off('paste', this.onPaste);
     editor.$emacsModeHandler = null;
 };
-
-var $kbSessionChange = function(e) {
+var $kbSessionChange = function (e) {
     if (e.oldSession) {
         e.oldSession.$selectLongWords = $formerLongWords;
         e.oldSession.$useEmacsStyleLineStart = $formerLineStart;
     }
-
     $formerLongWords = e.session.$selectLongWords;
     e.session.$selectLongWords = true;
     $formerLineStart = e.session.$useEmacsStyleLineStart;
     e.session.$useEmacsStyleLineStart = true;
-
     if (!e.session.hasOwnProperty('$emacsMark'))
         e.session.$emacsMark = null;
     if (!e.session.hasOwnProperty('$emacsMarkRing'))
         e.session.$emacsMarkRing = [];
 };
-
-var $resetMarkMode = function(e) {
+var $resetMarkMode = function (e) {
     e.editor.session.$emacsMark = null;
 };
-
 var keys = require("../lib/keys").KEY_MODS;
-var eMods = {C: "ctrl", S: "shift", M: "alt", CMD: "command"};
+var eMods = { C: "ctrl", S: "shift", M: "alt", CMD: "command" };
 var combinations = ["C-S-M-CMD",
-                    "S-M-CMD", "C-M-CMD", "C-S-CMD", "C-S-M",
-                    "M-CMD", "S-CMD", "S-M", "C-CMD", "C-M", "C-S",
-                    "CMD", "M", "S", "C"];
-combinations.forEach(function(c) {
+    "S-M-CMD", "C-M-CMD", "C-S-CMD", "C-S-M",
+    "M-CMD", "S-CMD", "S-M", "C-CMD", "C-M", "C-S",
+    "CMD", "M", "S", "C"];
+combinations.forEach(function (c) {
     var hashId = 0;
-    c.split("-").forEach(function(c) {
+    c.split("-").forEach(function (c) {
         hashId = hashId | keys[eMods[c]];
     });
     eMods[hashId] = c.toLowerCase() + "-";
 });
-
-exports.handler.onCopy = function(e, editor) {
-    if (editor.$handlesEmacsOnCopy) return;
+exports.handler.onCopy = function (e, editor) {
+    if (editor.$handlesEmacsOnCopy)
+        return;
     editor.$handlesEmacsOnCopy = true;
     exports.handler.commands.killRingSave.exec(editor);
     editor.$handlesEmacsOnCopy = false;
 };
-
-exports.handler.onPaste = function(e, editor) {
+exports.handler.onPaste = function (e, editor) {
     editor.pushEmacsMark(editor.getCursorPosition());
 };
-
-exports.handler.bindKey = function(key, command) {
+exports.handler.bindKey = function (key, command) {
     if (typeof key == "object")
         key = key[this.platform];
     if (!key)
         return;
-
     var ckb = this.commandKeyBinding;
-    key.split("|").forEach(function(keyPart) {
+    key.split("|").forEach(function (keyPart) {
         keyPart = keyPart.toLowerCase();
         ckb[keyPart] = command;
-        var keyParts = keyPart.split(" ").slice(0,-1);
-        keyParts.reduce(function(keyMapKeys, keyPart, i) {
-            var prefix = keyMapKeys[i-1] ? keyMapKeys[i-1] + ' ' : '';
+        var keyParts = keyPart.split(" ").slice(0, -1);
+        keyParts.reduce(function (keyMapKeys, keyPart, i) {
+            var prefix = keyMapKeys[i - 1] ? keyMapKeys[i - 1] + ' ' : '';
             return keyMapKeys.concat([prefix + keyPart]);
-        }, []).forEach(function(keyPart) {
-            if (!ckb[keyPart]) ckb[keyPart] = "null";
+        }, []).forEach(function (keyPart) {
+            if (!ckb[keyPart])
+                ckb[keyPart] = "null";
         });
     }, this);
 };
-
-exports.handler.getStatusText = function(editor, data) {
-  var str = "";
-  if (data.count)
-    str += data.count;
-  if (data.keyChain)
-    str += " " + data.keyChain;
-  return str;
+exports.handler.getStatusText = function (editor, data) {
+    var str = "";
+    if (data.count)
+        str += data.count;
+    if (data.keyChain)
+        str += " " + data.keyChain;
+    return str;
 };
-
-exports.handler.handleKeyboard = function(data, hashId, key, keyCode) {
-    if (keyCode === -1) return undefined;
-
+exports.handler.handleKeyboard = function (data, hashId, key, keyCode) {
+    if (keyCode === -1)
+        return undefined;
     var editor = data.editor;
     editor._signal("changeStatus");
     if (hashId == -1) {
@@ -803,40 +714,42 @@ exports.handler.handleKeyboard = function(data, hashId, key, keyCode) {
         if (data.count) {
             var str = new Array(data.count + 1).join(key);
             data.count = null;
-            return {command: "insertstring", args: str};
+            return { command: "insertstring", args: str };
         }
     }
-
     var modifier = eMods[hashId];
     if (modifier == "c-" || data.count) {
         var count = parseInt(key[key.length - 1]);
         if (typeof count === 'number' && !isNaN(count)) {
             data.count = Math.max(data.count, 0) || 0;
             data.count = 10 * data.count + count;
-            return {command: "null"};
+            return { command: "null" };
         }
     }
-    if (modifier) key = modifier + key;
-    if (data.keyChain) key = data.keyChain += " " + key;
+    if (modifier)
+        key = modifier + key;
+    if (data.keyChain)
+        key = data.keyChain += " " + key;
     var command = this.commandKeyBinding[key];
     data.keyChain = command == "null" ? key : "";
-    if (!command) return undefined;
-    if (command === "null") return {command: "null"};
-
+    if (!command)
+        return undefined;
+    if (command === "null")
+        return { command: "null" };
     if (command === "universalArgument") {
         data.count = -4;
-        return {command: "null"};
+        return { command: "null" };
     }
     var args;
     if (typeof command !== "string") {
         args = command.args;
-        if (command.command) command = command.command;
+        if (command.command)
+            command = command.command;
         if (command === "goorselect") {
             command = editor.emacsMark() ? args[1] : args[0];
             args = null;
         }
     }
-
     if (typeof command === "string") {
         if (command === "insertstring" ||
             command === "splitline" ||
@@ -844,15 +757,13 @@ exports.handler.handleKeyboard = function(data, hashId, key, keyCode) {
             editor.pushEmacsMark();
         }
         command = this.commands[command] || editor.commands.commands[command];
-        if (!command) return undefined;
+        if (!command)
+            return undefined;
     }
-
     if (!command.readOnly && !command.isYank)
         data.lastCommand = null;
-
     if (!command.readOnly && editor.emacsMark())
         editor.setEmacsMark(null);
-        
     if (data.count) {
         var count = data.count;
         data.count = 0;
@@ -860,147 +771,134 @@ exports.handler.handleKeyboard = function(data, hashId, key, keyCode) {
             return {
                 args: args,
                 command: {
-                    exec: function(editor, args) {
+                    exec: function (editor, args) {
                         for (var i = 0; i < count; i++)
                             command.exec(editor, args);
                     },
                     multiSelectAction: command.multiSelectAction
                 }
             };
-        } else {
-            if (!args) args = {};
-            if (typeof args === 'object') args.count = count;
+        }
+        else {
+            if (!args)
+                args = {};
+            if (typeof args === 'object')
+                args.count = count;
         }
     }
-
-    return {command: command, args: args};
+    return { command: command, args: args };
 };
-
 exports.emacsKeys = {
-    "Up|C-p"      : {command: "goorselect", args: ["golineup","selectup"]},
-    "Down|C-n"    : {command: "goorselect", args: ["golinedown","selectdown"]},
-    "Left|C-b"    : {command: "goorselect", args: ["gotoleft","selectleft"]},
-    "Right|C-f"   : {command: "goorselect", args: ["gotoright","selectright"]},
-    "C-Left|M-b"  : {command: "goorselect", args: ["gotowordleft","selectwordleft"]},
-    "C-Right|M-f" : {command: "goorselect", args: ["gotowordright","selectwordright"]},
-    "Home|C-a"    : {command: "goorselect", args: ["gotolinestart","selecttolinestart"]},
-    "End|C-e"     : {command: "goorselect", args: ["gotolineend","selecttolineend"]},
-    "C-Home|S-M-,": {command: "goorselect", args: ["gotostart","selecttostart"]},
-    "C-End|S-M-." : {command: "goorselect", args: ["gotoend","selecttoend"]},
-    "S-Up|S-C-p"      : "selectup",
-    "S-Down|S-C-n"    : "selectdown",
-    "S-Left|S-C-b"    : "selectleft",
-    "S-Right|S-C-f"   : "selectright",
-    "S-C-Left|S-M-b"  : "selectwordleft",
-    "S-C-Right|S-M-f" : "selectwordright",
-    "S-Home|S-C-a"    : "selecttolinestart",
-    "S-End|S-C-e"     : "selecttolineend",
-    "S-C-Home"        : "selecttostart",
-    "S-C-End"         : "selecttoend",
-
-    "C-l" : "recenterTopBottom",
-    "M-s" : "centerselection",
+    "Up|C-p": { command: "goorselect", args: ["golineup", "selectup"] },
+    "Down|C-n": { command: "goorselect", args: ["golinedown", "selectdown"] },
+    "Left|C-b": { command: "goorselect", args: ["gotoleft", "selectleft"] },
+    "Right|C-f": { command: "goorselect", args: ["gotoright", "selectright"] },
+    "C-Left|M-b": { command: "goorselect", args: ["gotowordleft", "selectwordleft"] },
+    "C-Right|M-f": { command: "goorselect", args: ["gotowordright", "selectwordright"] },
+    "Home|C-a": { command: "goorselect", args: ["gotolinestart", "selecttolinestart"] },
+    "End|C-e": { command: "goorselect", args: ["gotolineend", "selecttolineend"] },
+    "C-Home|S-M-,": { command: "goorselect", args: ["gotostart", "selecttostart"] },
+    "C-End|S-M-.": { command: "goorselect", args: ["gotoend", "selecttoend"] },
+    "S-Up|S-C-p": "selectup",
+    "S-Down|S-C-n": "selectdown",
+    "S-Left|S-C-b": "selectleft",
+    "S-Right|S-C-f": "selectright",
+    "S-C-Left|S-M-b": "selectwordleft",
+    "S-C-Right|S-M-f": "selectwordright",
+    "S-Home|S-C-a": "selecttolinestart",
+    "S-End|S-C-e": "selecttolineend",
+    "S-C-Home": "selecttostart",
+    "S-C-End": "selecttoend",
+    "C-l": "recenterTopBottom",
+    "M-s": "centerselection",
     "M-g": "gotoline",
     "C-x C-p": "selectall",
-    "C-Down": {command: "goorselect", args: ["gotopagedown","selectpagedown"]},
-    "C-Up": {command: "goorselect", args: ["gotopageup","selectpageup"]},
-    "PageDown|C-v": {command: "goorselect", args: ["gotopagedown","selectpagedown"]},
-    "PageUp|M-v": {command: "goorselect", args: ["gotopageup","selectpageup"]},
+    "C-Down": { command: "goorselect", args: ["gotopagedown", "selectpagedown"] },
+    "C-Up": { command: "goorselect", args: ["gotopageup", "selectpageup"] },
+    "PageDown|C-v": { command: "goorselect", args: ["gotopagedown", "selectpagedown"] },
+    "PageUp|M-v": { command: "goorselect", args: ["gotopageup", "selectpageup"] },
     "S-C-Down": "selectpagedown",
     "S-C-Up": "selectpageup",
-
     "C-s": "iSearch",
     "C-r": "iSearchBackwards",
-
     "M-C-s": "findnext",
     "M-C-r": "findprevious",
     "S-M-5": "replace",
     "Backspace": "backspace",
     "Delete|C-d": "del",
-    "Return|C-m": {command: "insertstring", args: "\n"}, // "newline"
+    "Return|C-m": { command: "insertstring", args: "\n" },
     "C-o": "splitline",
-
-    "M-d|C-Delete": {command: "killWord", args: "right"},
-    "C-Backspace|M-Backspace|M-Delete": {command: "killWord", args: "left"},
+    "M-d|C-Delete": { command: "killWord", args: "right" },
+    "C-Backspace|M-Backspace|M-Delete": { command: "killWord", args: "left" },
     "C-k": "killLine",
-
     "C-y|S-Delete": "yank",
     "M-y": "yankRotate",
     "C-g": "keyboardQuit",
-
     "C-w|C-S-W": "killRegion",
     "M-w": "killRingSave",
     "C-Space": "setMark",
     "C-x C-x": "exchangePointAndMark",
-
     "C-t": "transposeletters",
-    "M-u": "touppercase",    // Doesn't work
+    "M-u": "touppercase",
     "M-l": "tolowercase",
-    "M-/": "autocomplete",   // Doesn't work
+    "M-/": "autocomplete",
     "C-u": "universalArgument",
-
     "M-;": "togglecomment",
-
     "C-/|C-x u|S-C--|C-z": "undo",
-    "S-C-/|S-C-x u|C--|S-C-z": "redo", // infinite undo?
-    "C-x r":  "selectRectangularRegion",
-    "M-x": {command: "focusCommandLine", args: "M-x "}
+    "S-C-/|S-C-x u|C--|S-C-z": "redo",
+    "C-x r": "selectRectangularRegion",
+    "M-x": { command: "focusCommandLine", args: "M-x " }
 };
-
-
 exports.handler.bindKeys(exports.emacsKeys);
-
 exports.handler.addCommands({
-    recenterTopBottom: function(editor) {
+    recenterTopBottom: function (editor) {
         var renderer = editor.renderer;
         var pos = renderer.$cursorLayer.getPixelPosition();
         var h = renderer.$size.scrollerHeight - renderer.lineHeight;
         var scrollTop = renderer.scrollTop;
         if (Math.abs(pos.top - scrollTop) < 2) {
             scrollTop = pos.top - h;
-        } else if (Math.abs(pos.top - scrollTop - h * 0.5) < 2) {
+        }
+        else if (Math.abs(pos.top - scrollTop - h * 0.5) < 2) {
             scrollTop = pos.top;
-        } else {
+        }
+        else {
             scrollTop = pos.top - h * 0.5;
         }
         editor.session.setScrollTop(scrollTop);
     },
-    selectRectangularRegion:  function(editor) {
+    selectRectangularRegion: function (editor) {
         editor.multiSelect.toggleBlockSelection();
     },
-    setMark:  {
-        exec: function(editor, args) {
-
+    setMark: {
+        exec: function (editor, args) {
             if (args && args.count) {
-                if (editor.inMultiSelectMode) editor.forEachSelection(moveToMark);
-                else moveToMark();
+                if (editor.inMultiSelectMode)
+                    editor.forEachSelection(moveToMark);
+                else
+                    moveToMark();
                 moveToMark();
                 return;
             }
-
-            var mark = editor.emacsMark(),
-                ranges = editor.selection.getAllRanges(),
-                rangePositions = ranges.map(function(r) { return {row: r.start.row, column: r.start.column}; }),
-                transientMarkModeActive = true,
-                hasNoSelection = ranges.every(function(range) { return range.isEmpty(); });
+            var mark = editor.emacsMark(), ranges = editor.selection.getAllRanges(), rangePositions = ranges.map(function (r) { return { row: r.start.row, column: r.start.column }; }), transientMarkModeActive = true, hasNoSelection = ranges.every(function (range) { return range.isEmpty(); });
             if (transientMarkModeActive && (mark || !hasNoSelection)) {
-                if (editor.inMultiSelectMode) editor.forEachSelection({exec: editor.clearSelection.bind(editor)});
-                else editor.clearSelection();
-                if (mark) editor.pushEmacsMark(null);
+                if (editor.inMultiSelectMode)
+                    editor.forEachSelection({ exec: editor.clearSelection.bind(editor) });
+                else
+                    editor.clearSelection();
+                if (mark)
+                    editor.pushEmacsMark(null);
                 return;
             }
-
             if (!mark) {
-                rangePositions.forEach(function(pos) { editor.pushEmacsMark(pos); });
-                editor.setEmacsMark(rangePositions[rangePositions.length-1]);
+                rangePositions.forEach(function (pos) { editor.pushEmacsMark(pos); });
+                editor.setEmacsMark(rangePositions[rangePositions.length - 1]);
                 return;
             }
-
             function moveToMark() {
                 var mark = editor.popEmacsMark();
                 mark && editor.moveCursorToPosition(mark);
             }
-
         },
         readOnly: true,
         handlesCount: true
@@ -1012,12 +910,12 @@ exports.handler.addCommands({
                 sel.setSelectionRange(sel.getRange(), !sel.isBackwards());
                 return;
             }
-
             if (args.count) { // replace mark and point
-                var pos = {row: sel.lead.row, column: sel.lead.column};
+                var pos = { row: sel.lead.row, column: sel.lead.column };
                 sel.clearSelection();
                 sel.moveCursorToPosition(editor.emacsMarkForSelection(pos));
-            } else { // create selection to last mark
+            }
+            else { // create selection to last mark
                 sel.selectToPosition(editor.emacsMarkForSelection());
             }
         },
@@ -1026,30 +924,27 @@ exports.handler.addCommands({
         multiSelectAction: "forEach"
     },
     killWord: {
-        exec: function(editor, dir) {
+        exec: function (editor, dir) {
             editor.clearSelection();
             if (dir == "left")
                 editor.selection.selectWordLeft();
             else
                 editor.selection.selectWordRight();
-
             var range = editor.getSelectionRange();
             var text = editor.session.getTextRange(range);
             exports.killRing.add(text);
-
             editor.session.remove(range);
             editor.clearSelection();
         },
         multiSelectAction: "forEach"
     },
-    killLine: function(editor) {
+    killLine: function (editor) {
         editor.pushEmacsMark(null);
         editor.clearSelection();
         var range = editor.getSelectionRange();
         var line = editor.session.getLine(range.start.row);
         range.end.column = line.length;
         line = line.substr(range.start.column);
-        
         var foldLine = editor.session.getFoldLine(range.start.row);
         if (foldLine && range.end.row != foldLine.end.row) {
             range.end.row = foldLine.end.row;
@@ -1065,15 +960,14 @@ exports.handler.addCommands({
             exports.killRing.append(text);
         else
             exports.killRing.add(text);
-
         editor.session.remove(range);
         editor.clearSelection();
     },
-    yank: function(editor) {
+    yank: function (editor) {
         editor.onPaste(exports.killRing.get() || '');
         editor.keyBinding.$data.lastCommand = "yank";
     },
-    yankRotate: function(editor) {
+    yankRotate: function (editor) {
         if (editor.keyBinding.$data.lastCommand != "yank")
             return;
         editor.undo();
@@ -1082,7 +976,7 @@ exports.handler.addCommands({
         editor.keyBinding.$data.lastCommand = "yank";
     },
     killRegion: {
-        exec: function(editor) {
+        exec: function (editor) {
             exports.killRing.add(editor.getCopyText());
             editor.commands.byName.cut.exec(editor);
             editor.setEmacsMark(null);
@@ -1091,69 +985,66 @@ exports.handler.addCommands({
         multiSelectAction: "forEach"
     },
     killRingSave: {
-        exec: function(editor) {
-
+        exec: function (editor) {
             editor.$handlesEmacsOnCopy = true;
-            var marks = editor.session.$emacsMarkRing.slice(),
-                deselectedMarks = [];
+            var marks = editor.session.$emacsMarkRing.slice(), deselectedMarks = [];
             exports.killRing.add(editor.getCopyText());
-
-            setTimeout(function() {
+            setTimeout(function () {
                 function deselect() {
-                    var sel = editor.selection, range = sel.getRange(),
-                        pos = sel.isBackwards() ? range.end : range.start;
-                    deselectedMarks.push({row: pos.row, column: pos.column});
+                    var sel = editor.selection, range = sel.getRange(), pos = sel.isBackwards() ? range.end : range.start;
+                    deselectedMarks.push({ row: pos.row, column: pos.column });
                     sel.clearSelection();
                 }
                 editor.$handlesEmacsOnCopy = false;
-                if (editor.inMultiSelectMode) editor.forEachSelection({exec: deselect});
-                else deselect();
+                if (editor.inMultiSelectMode)
+                    editor.forEachSelection({ exec: deselect });
+                else
+                    deselect();
                 editor.setEmacsMark(null);
                 editor.session.$emacsMarkRing = marks.concat(deselectedMarks.reverse());
             }, 0);
         },
         readOnly: true
     },
-    keyboardQuit: function(editor) {
+    keyboardQuit: function (editor) {
         editor.selection.clearSelection();
         editor.setEmacsMark(null);
         editor.keyBinding.$data.count = null;
     },
-    focusCommandLine: function(editor, arg) {
+    focusCommandLine: function (editor, arg) {
         if (editor.showCommandLine)
             editor.showCommandLine(arg);
     }
 });
-
 exports.handler.addCommands(iSearchCommandModule.iSearchStartCommands);
-
 var commands = exports.handler.commands;
 commands.yank.isYank = true;
 commands.yankRotate.isYank = true;
-
 exports.killRing = {
     $data: [],
-    add: function(str) {
+    add: function (str) {
         str && this.$data.push(str);
         if (this.$data.length > 30)
             this.$data.shift();
     },
-    append: function(str) {
+    append: function (str) {
         var idx = this.$data.length - 1;
         var text = this.$data[idx] || "";
-        if (str) text += str;
-        if (text) this.$data[idx] = text;
+        if (str)
+            text += str;
+        if (text)
+            this.$data[idx] = text;
     },
-    get: function(n) {
+    get: function (n) {
         n = n || 1;
-        return this.$data.slice(this.$data.length-n, this.$data.length).reverse().join('\n');
+        return this.$data.slice(this.$data.length - n, this.$data.length).reverse().join('\n');
     },
-    pop: function() {
+    pop: function () {
         if (this.$data.length > 1)
             this.$data.pop();
         return this.get();
     },
-    rotate: function() {
+    rotate: function () {
         this.$data.unshift(this.$data.pop());
         return this.get();
     }