Bug 1512289 - Remove webconsole reverse search pref; r=bgrins.

Differential Revision: https://phabricator.services.mozilla.com/D13913

--HG--
extra : moz-landing-system : lando

devtools/client/preferences/devtools-client.js

@@ -277,9 +277,6 @@ pref("devtools.webconsole.sidebarToggle", false);
 // Enable CodeMirror in the JsTerm
 pref("devtools.webconsole.jsterm.codeMirror", true);
 
-// Enable console input reverse-search everywhere
-pref("devtools.webconsole.jsterm.reverse-search", true);
-
 // Disable the new performance recording panel by default
 pref("devtools.performance.new-panel-enabled", false);
 

devtools/client/webconsole/components/App.js

@@ -46,7 +46,6 @@ class App extends Component {
       serviceContainer: PropTypes.object.isRequired,
       closeSplitConsole: PropTypes.func.isRequired,
       jstermCodeMirror: PropTypes.bool,
-      jstermReverseSearch: PropTypes.bool,
       currentReverseSearchEntry: PropTypes.string,
       reverseSearchInputVisible: PropTypes.bool,
     };
@@ -63,14 +62,11 @@ class App extends Component {
   onKeyDown(event) {
     const {
       dispatch,
-      jstermReverseSearch,
     } = this.props;
 
     if (
-      jstermReverseSearch && (
+      (!isMacOS && event.key === "F9") ||
-        (!isMacOS && event.key === "F9") ||
+      (isMacOS && event.key === "r" && event.ctrlKey === true)
-        (isMacOS && event.key === "r" && event.ctrlKey === true)
-      )
     ) {
       dispatch(actions.reverseSearchInputToggle());
       event.stopPropagation();
@@ -199,7 +195,6 @@ class App extends Component {
       serviceContainer,
       closeSplitConsole,
       jstermCodeMirror,
-      jstermReverseSearch,
     } = this.props;
 
     const classNames = ["webconsole-output-wrapper"];
@@ -245,11 +240,9 @@ class App extends Component {
             onPaste: this.onPaste,
             codeMirrorEnabled: jstermCodeMirror,
           }),
-          jstermReverseSearch
+          ReverseSearchInput({
-            ? ReverseSearchInput({
+            hud,
-              hud,
+          })
-            })
-            : null
         ),
         SideBar({
           serviceContainer,

devtools/client/webconsole/constants.js

@@ -72,7 +72,6 @@ const prefs = {
       // We use the same pref to enable the sidebar on webconsole and browser console.
       SIDEBAR_TOGGLE: "devtools.webconsole.sidebarToggle",
       JSTERM_CODE_MIRROR: "devtools.webconsole.jsterm.codeMirror",
-      JSTERM_REVERSE_SEARCH: "devtools.webconsole.jsterm.reverse-search",
     },
   },
 };

devtools/client/webconsole/store.js

@@ -49,7 +49,6 @@ function configureStore(hud, options = {}) {
     || Math.max(getIntPref("devtools.hud.loglimit"), 1);
   const sidebarToggle = getBoolPref(PREFS.FEATURES.SIDEBAR_TOGGLE);
   const jstermCodeMirror = getBoolPref(PREFS.FEATURES.JSTERM_CODE_MIRROR);
-  const jstermReverseSearch = getBoolPref(PREFS.FEATURES.JSTERM_REVERSE_SEARCH);
   const historyCount = getIntPref(PREFS.UI.INPUT_HISTORY_COUNT);
 
   const initialState = {
@@ -57,7 +56,6 @@ function configureStore(hud, options = {}) {
       logLimit,
       sidebarToggle,
       jstermCodeMirror,
-      jstermReverseSearch,
       historyCount,
     }),
     filters: FilterState({

devtools/client/webconsole/test/mocha-test-setup.js

@@ -25,7 +25,6 @@ pref("devtools.webconsole.persistlog", false);
 pref("devtools.webconsole.timestampMessages", false);
 pref("devtools.webconsole.sidebarToggle", true);
 pref("devtools.webconsole.jsterm.codeMirror", true);
-pref("devtools.webconsole.jsterm.reverse-search", true);
 
 global.loader = {
   lazyServiceGetter: () => {},

devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search.js

@@ -10,9 +10,6 @@ const TEST_URI = `data:text/html,<meta charset=utf8>Test reverse search`;
 const isMacOS = AppConstants.platform === "macosx";
 
 add_task(async function() {
-  // Force reverse search on.
-  await pushPref("devtools.webconsole.jsterm.reverse-search", true);
-
   const hud = await openNewTabAndConsole(TEST_URI);
 
   const jstermHistory = [

devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_keyboard_navigation.js

@@ -10,9 +10,6 @@ const TEST_URI = `data:text/html,<meta charset=utf8>Test reverse search`;
 const isMacOS = AppConstants.platform === "macosx";
 
 add_task(async function() {
-  // Force reverse search on.
-  await pushPref("devtools.webconsole.jsterm.reverse-search", true);
-
   const hud = await openNewTabAndConsole(TEST_URI);
 
   const jstermHistory = [

devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_mouse_navigation.js

@@ -9,9 +9,6 @@
 const TEST_URI = `data:text/html,<meta charset=utf8>Test reverse search`;
 
 add_task(async function() {
-  // Force reverse search on.
-  await pushPref("devtools.webconsole.jsterm.reverse-search", true);
-
   const hud = await openNewTabAndConsole(TEST_URI);
 
   const jstermHistory = [

devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_toggle.js

@@ -10,9 +10,6 @@ const TEST_URI = `data:text/html,<meta charset=utf8>Test reverse search toggle`;
 const isMacOS = AppConstants.platform === "macosx";
 
 add_task(async function() {
-  // Force reverse search on.
-  await pushPref("devtools.webconsole.jsterm.reverse-search", true);
-
   const hud = await openNewTabAndConsole(TEST_URI);
 
   info("Close the reverse search UI with ESC");

devtools/client/webconsole/webconsole-output-wrapper.js

@@ -263,7 +263,6 @@ WebConsoleOutputWrapper.prototype = {
         closeSplitConsole: this.closeSplitConsole.bind(this),
         jstermCodeMirror: prefs.jstermCodeMirror
           && !Services.appinfo.accessibilityEnabled,
-        jstermReverseSearch: prefs.jstermReverseSearch,
       });
 
       // Render the root Application component.