Bug 1364386 - Use only file name for search; r=nchevobbe draft
authorJan Odvarko <odvarko@gmail.com>
Tue, 16 May 2017 16:25:08 +0200
changeset 579561 cb97fcdf715441e9d674e66f75518f6b7ef55ee1
parent 579118 41958333867b0f537271dbd4cb4ba9e8a67a85a8
child 579562 0e37fe3fec035115a6a97835258bbeac69e6af07
push id59293
push userjodvarko@mozilla.com
push dateWed, 17 May 2017 12:52:55 +0000
reviewersnchevobbe
bugs1364386
milestone55.0a1
Bug 1364386 - Use only file name for search; r=nchevobbe MozReview-Commit-ID: U26CX1EbLP
devtools/client/webconsole/new-console-output/selectors/messages.js
--- a/devtools/client/webconsole/new-console-output/selectors/messages.js
+++ b/devtools/client/webconsole/new-console-output/selectors/messages.js
@@ -4,16 +4,17 @@
  * 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/. */
 "use strict";
 
 const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
 const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
 const { getLogLimit } = require("devtools/client/webconsole/new-console-output/selectors/prefs");
 const { getGripPreviewItems } = require("devtools/client/shared/components/reps/reps");
+const { getSourceNames } = require("devtools/client/shared/source-utils");
 const {
   MESSAGE_TYPE,
   MESSAGE_SOURCE
 } = require("devtools/client/webconsole/new-console-output/constants");
 
 function getAllMessages(state) {
   let messages = getAllMessagesById(state);
   let logLimit = getLogLimit(state);
@@ -126,18 +127,19 @@ function matchSearchFilters(message, fil
 
 /**
  * Returns true if given text is included in provided stack frame.
  */
 function isTextInFrame(text, frame) {
   if (!frame) {
     return false;
   }
-  return Object.values(frame)
-    .join(":")
+
+  const { short } = getSourceNames(frame.source);
+  return `${short}:${frame.line}:${frame.column}`
     .toLocaleLowerCase()
     .includes(text.toLocaleLowerCase());
 }
 
 /**
  * Returns true if given text is included in provided parameters.
  */
 function isTextInParameters(text, parameters) {