occur+isearch: adding occurisearch command and binding it to Ctrl-o by default

lib/ace/commands/incremental_search_commands.js

@@ -31,6 +31,9 @@
 define(function(require, exports, module) {
 
 var config = require("../config");
+var oop = require("../lib/oop");
+var HashHandler = require("../keyboard/hash_handler").HashHandler;
+var occurStartCommand = require("ace/commands/occur_commands").occurStartCommand;
 
 // These commands can be installed in a normal key handler to start iSearch:
 exports.iSearchStartCommands = [{
@@ -121,13 +124,18 @@ exports.iSearchCommands = [{
     exec: function(iSearch) { iSearch.deactivate(true); },
     readOnly: true,
     isIncrementalSearchCommand: true
+}, {
+    name: 'occurisearch',
+    bindKey: 'Ctrl-O',
+    exec: function(iSearch) {
+        var options = oop.mixin({}, iSearch.$options);
+        iSearch.deactivate();
+        occurStartCommand.exec(iSearch.$editor, options);
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }];
 
-
-
-var HashHandler = require("../keyboard/hash_handler").HashHandler;
-var oop = require("../lib/oop");
-
 function IncrementalSearchKeyboardHandler(iSearch) {
     this.$iSearch = iSearch;
 }

lib/ace/commands/occur_commands.js

@@ -34,7 +34,7 @@ var config = require("../config"),
     Occur = require("../occur").Occur;
 
 // These commands can be installed in a normal command handler to start occur:
-var occurStartCommands = [{
+var occurStartCommand = {
     name: "occur",
     exec: function(editor, options) {
         var alreadyInOccur = !!editor.session.$occur;
@@ -43,7 +43,7 @@ var occurStartCommands = [{
             OccurKeyboardHandler.installIn(editor);
     },
     readOnly: true
-}];
+};
 
 var occurCommands = [{
     name: "occurexit",
@@ -105,6 +105,6 @@ OccurKeyboardHandler.uninstallFrom = function(editor) {
         editor.keyBinding.removeKeyboardHandler(handler);
 }
 
-exports.commands = occurStartCommands;
+exports.occurStartCommand = occurStartCommand;
 
 });