Revert "Bug 1971094 - [devtools] Update search results when the selected source changes r=devtools-reviewers,nchevobbe" for causing failures at browser_dbg-search-file-retains-query.js.

This reverts commit c853ad4.

Author: Atila Butkovits

devtools/client/debugger/src/components/Editor/SearchInFileBar.js

@@ -13,6 +13,7 @@ import {
   getIsCurrentThreadPaused,
   getSelectedSourceTextContent,
   getSearchOptions,
+  getSelectedFrame,
 } from "../../selectors/index";
 
 import { searchKeys } from "../../constants";
@@ -59,6 +60,7 @@ class SearchInFileBar extends Component {
       searchInFileEnabled: PropTypes.bool.isRequired,
       selectedSourceTextContent: PropTypes.object,
       selectedSource: PropTypes.object.isRequired,
+      selectedFrame: PropTypes.object.isRequired,
       setActiveSearch: PropTypes.func.isRequired,
       querySearchWorker: PropTypes.func.isRequired,
       selectLocation: PropTypes.func.isRequired,
@@ -83,8 +85,9 @@ class SearchInFileBar extends Component {
       query &&
       this.props.selectedSource &&
       this.props.searchInFileEnabled &&
+      nextProps.selectedFrame &&
       // If a new source is selected update the file search results
-      this.props.selectedSource.id !== nextProps.selectedSource.id
+      nextProps.selectedFrame.location.source.id !== nextProps.selectedSource.id
     ) {
       // Do not scroll to the search location, if we just switched a new source
       // and debugger is already paused on a selelcted line.
@@ -397,6 +400,7 @@ const mapStateToProps = state => {
     selectedSource: getSelectedSource(state),
     isPaused: getIsCurrentThreadPaused(state),
     selectedSourceTextContent: getSelectedSourceTextContent(state),
+    selectedFrame: getSelectedFrame(state),
     modifiers: getSearchOptions(state, "file-search"),
   };
 };

devtools/client/debugger/test/mochitest/browser_dbg-search-file-retains-query.js

@@ -2,10 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
+// Tests the search bar retains previous query on re-opening.
+
 "use strict";
 
-// Tests the search bar retains previous query on re-opening.
-add_task(async function testSearchRetainsPreviousQuery() {
+add_task(async function () {
   const dbg = await initDebugger("doc-scripts.html", "simple1.js");
   const {
     selectors: { getActiveSearch },
@@ -35,54 +36,3 @@ add_task(async function testSearchRetainsPreviousQuery() {
   // Test for the retained query
   is(findElement(dbg, "fileSearchInput").value, "con");
 });
-
-// Tests that the search results are updated when switching between sources
-add_task(async function testSearchUpdatesResultsOnSourceChanges() {
-  const dbg = await initDebugger("doc-scripts.html", "simple1.js", "long.js");
-  const {
-    selectors: { getActiveSearch },
-  } = dbg;
-
-  await selectSource(dbg, "simple1.js");
-
-  // Open search bar
-  pressKey(dbg, "fileSearch");
-  await waitFor(() => getActiveSearch() === "file");
-  is(getActiveSearch(), "file");
-
-  // Type a search query
-  const searchQuery = "this";
-  type(dbg, searchQuery);
-  await waitForSearchState(dbg);
-
-  await waitUntil(
-    () => findElement(dbg, "fileSearchSummary").innerText !== "No results found"
-  );
-
-  is(
-    findElement(dbg, "fileSearchSummary").innerText,
-    "1 of 3 results",
-    `There are 3 results found for search query "${searchQuery}" in simple1.js`
-  );
-  is(
-    findElement(dbg, "fileSearchInput").value,
-    searchQuery,
-    `The search input value matches the search query "${searchQuery}"`
-  );
-
-  info("Switch to long.js");
-  await selectSource(dbg, "long.js");
-
-  await waitUntil(
-    () => findElement(dbg, "fileSearchSummary").innerText == "1 of 23 results"
-  );
-  ok(
-    true,
-    `There are 23 results found for search query "${searchQuery}" in long.js`
-  );
-  is(
-    findElement(dbg, "fileSearchInput").value,
-    searchQuery,
-    `The search input value still matches the search query "${searchQuery}"`
-  );
-});

devtools/client/debugger/test/mochitest/shared-head.js

@@ -1940,7 +1940,6 @@ const selectors = {
   sourceTreeFolderNode: ".sources-panel .node .folder",
   excludePatternsInput: ".project-text-search .exclude-patterns-field input",
   fileSearchInput: ".search-bar input",
-  fileSearchSummary: ".search-bar .search-field-summary",
   watchExpressionsHeader: ".watch-expressions-pane ._header .header-label",
   watchExpressionsAddButton: ".watch-expressions-pane ._header .plus",
   editorNotificationFooter: ".editor-notification-footer",