From c1648db60b6db6b18c115a2fd0f4c0a10e8cc21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 16 Jun 2017 02:01:57 +0000
Subject: [PATCH] codemirror-extension: add menu entries for search, search and
 replace & jump to line

Only because Ctrl+Shit-F, the default keybinding for search and replace
is already assinged to toggle file browser.

This local to the current editor, so not good enough for
https://github.com/jupyterlab/jupyterlab/issues/1074
---
 packages/codemirror-extension/src/index.ts | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/packages/codemirror-extension/src/index.ts b/packages/codemirror-extension/src/index.ts
index 2ff24227d5a5..551e682180cb 100644
--- a/packages/codemirror-extension/src/index.ts
+++ b/packages/codemirror-extension/src/index.ts
@@ -52,6 +52,15 @@ namespace CommandIDs {
 
   export
   const changeTabs = 'codemirror:change-tabs';
+
+  export
+  const search = 'codemirror:search';
+
+  export
+  const searchReplace = 'codemirror:search-replace';
+
+  export
+  const jumpToLine = 'codemirror:jump-to-line';
 };
 
 
@@ -165,6 +174,15 @@ function activateEditorCommands(app: JupyterLab, tracker: IEditorTracker, mainMe
     return tracker.currentWidget !== null;
   }
 
+  /**
+   * A test for whether editor has focus.
+   */
+  function isEditorVisible(): boolean {
+    return (tracker.currentWidget !== null &&
+            tracker.currentWidget.editor instanceof CodeMirrorEditor &&
+            tracker.currentWidget.isVisible);
+  }
+
   /**
    * Create a menu for the editor.
    */
@@ -319,6 +337,10 @@ function activateEditorCommands(app: JupyterLab, tracker: IEditorTracker, mainMe
     menu.addItem({ command: CommandIDs.matchBrackets });
     menu.addItem({ type: 'submenu', submenu: keyMapMenu });
     menu.addItem({ type: 'submenu', submenu: themeMenu });
+    menu.addItem({ type: 'separator' });
+    menu.addItem({ command: CommandIDs.search });
+    menu.addItem({ command: CommandIDs.searchReplace });
+    menu.addItem({ command: CommandIDs.jumpToLine });
 
     return menu;
   }
@@ -342,10 +364,46 @@ function activateEditorCommands(app: JupyterLab, tracker: IEditorTracker, mainMe
     isToggled: () => matchBrackets
   });
 
+  commands.addCommand(CommandIDs.search, {
+    label: 'Search',
+    execute: args => {
+      let widget = tracker.currentWidget;
+      if (widget.editor instanceof CodeMirrorEditor) {
+        widget.editor.execCommand("find");
+      }
+    },
+    isEnabled: isEditorVisible
+  });
+
+  commands.addCommand(CommandIDs.searchReplace, {
+    label: 'Search and Replace',
+    execute: args => {
+      let widget = tracker.currentWidget;
+      if (widget.editor instanceof CodeMirrorEditor) {
+        widget.editor.execCommand("replace");
+      }
+    },
+    isEnabled: isEditorVisible
+  });
+
+  commands.addCommand(CommandIDs.jumpToLine, {
+    label: 'Jump to Line',
+    execute: args => {
+      let widget = tracker.currentWidget;
+      if (widget.editor instanceof CodeMirrorEditor) {
+        widget.editor.execCommand("jumpToLine");
+      }
+    },
+    isEnabled: isEditorVisible
+  });
+
   [
     'editor:line-numbers',
     'editor:line-wrap',
     CommandIDs.matchBrackets,
+    CommandIDs.search,
+    CommandIDs.searchReplace,
+    CommandIDs.jumpToLine,
     'editor:create-console',
     'editor:run-code'
   ].forEach(command => palette.addItem({ command, category: 'Editor' }));