Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 299 insertions, 60 deletions

diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.js
index 78cc530cff..a4a5010c48 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/BreakpointHeading.js
@@ -12,7 +12,6 @@ import actions from "../../../actions/index";
 import {
   getTruncatedFileName,
   getDisplayPath,
-  getSourceQueryString,
   getFileURL,
 } from "../../../utils/source";
 import { createLocation } from "../../../utils/location";
@@ -40,7 +39,6 @@ class BreakpointHeading extends PureComponent {
     const { sources, source, selectSource } = this.props;
 
     const path = getDisplayPath(source, sources);
-    const query = getSourceQueryString(source);
     return div(
       {
         className: "breakpoint-heading",
@@ -67,7 +65,7 @@ class BreakpointHeading extends PureComponent {
         {
           className: "filename",
         },
-        getTruncatedFileName(source, query),
+        getTruncatedFileName(source),
         path && span(null, `../${path}/..`)
       )
     );
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/ExceptionOption.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/ExceptionOption.js
index 31ff3f44a3..caec23b848 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/ExceptionOption.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/ExceptionOption.js
@@ -21,7 +21,7 @@ export default function ExceptionOption({
     input({
       type: "checkbox",
       checked: isChecked,
-      onChange: onChange,
+      onChange,
     }),
     div(
       {
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js
index 0f5d6f7ae3..1f5e08cd7e 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/index.js
@@ -17,6 +17,7 @@ import { getSelectedLocation } from "../../../utils/selected-location";
 import { createHeadlessEditor } from "../../../utils/editor/create-editor";
 
 import { makeBreakpointId } from "../../../utils/breakpoint/index";
+import { features } from "../../../utils/prefs";
 
 import {
   getSelectedSource,
@@ -44,7 +45,7 @@ class Breakpoints extends Component {
     this.removeEditor();
   }
 
-  getEditor() {
+  getHeadlessEditor() {
     if (!this.headlessEditor) {
       this.headlessEditor = createHeadlessEditor();
     }
@@ -119,7 +120,7 @@ class Breakpoints extends Component {
       return null;
     }
 
-    const editor = this.getEditor();
+    const editor = this.getHeadlessEditor();
     const sources = breakpointSources.map(({ source }) => source);
     return div(
       {
@@ -153,7 +154,7 @@ class Breakpoints extends Component {
         className: "pane",
       },
       this.renderExceptionsOptions(),
-      this.renderBreakpoints()
+      !features.codemirrorNext ? this.renderBreakpoints() : null
     );
   }
 }
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/CommandBar.js b/devtools/client/debugger/src/components/SecondaryPanes/CommandBar.js
index deae156a40..3dca62d48a 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/CommandBar.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/CommandBar.js
@@ -231,7 +231,7 @@ class CommandBar extends Component {
             formatKey("trace"),
             this.props.logMethod
           ),
-      onClick: event => {
+      onClick: () => {
         this.props.toggleTracing();
       },
       onContextMenu: event => {
@@ -362,7 +362,7 @@ class CommandBar extends Component {
       MenuButton,
       {
         menuId: "debugger-settings-menu-button",
-        toolboxDoc: toolboxDoc,
+        toolboxDoc,
         className:
           "devtools-button command-bar-button debugger-settings-menu-button",
         title: L10N.getStr("settings.button.label"),
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
index ce7eabf89d..00c885ec16 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
@@ -116,11 +116,11 @@ class EventListeners extends Component {
     }
   };
 
-  onFocus = event => {
+  onFocus = () => {
     this.setState({ focused: true });
   };
 
-  onBlur = event => {
+  onBlur = () => {
     this.setState({ focused: false });
   };
 
@@ -136,7 +136,7 @@ class EventListeners extends Component {
         className: classnames("event-search-input", {
           focused,
         }),
-        placeholder: placeholder,
+        placeholder,
         value: searchText,
         onChange: this.onInputChange,
         onKeyDown: this.onKeyDown,
@@ -233,7 +233,7 @@ class EventListeners extends Component {
               indeterminate ? false : e.target.checked
             );
           },
-          checked: checked,
+          checked,
           ref: el => el && (el.indeterminate = indeterminate),
         }),
         span(
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Expressions.js b/devtools/client/debugger/src/components/SecondaryPanes/Expressions.js
index be05c7327c..89b1f651ce 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Expressions.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Expressions.js
@@ -296,7 +296,7 @@ class Expressions extends Component {
           roots: [root],
           autoExpandDepth: 0,
           disableWrap: true,
-          openLink: openLink,
+          openLink,
           createElement: this.createElement,
           onDoubleClick: (items, { depth }) => {
             if (depth === 0) {
@@ -374,7 +374,7 @@ class Expressions extends Component {
       input({
         className: "input-expression",
         type: "text",
-        placeholder: L10N.getStr("expressions.placeholder"),
+        placeholder: L10N.getStr("expressions.placeholder2"),
         onChange: this.handleChange,
         onBlur: this.hideInput,
         onKeyDown: this.handleKeyDown,
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.js
index 0c81d8afb4..2c5cc679bf 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.js
@@ -7,7 +7,7 @@ import PropTypes from "devtools/client/shared/vendor/react-prop-types";
 
 import AccessibleImage from "../../shared/AccessibleImage";
 import { formatDisplayName } from "../../../utils/pause/frames/index";
-import { getFilename, getFileURL } from "../../../utils/source";
+import { getFileURL } from "../../../utils/source";
 import FrameIndent from "./FrameIndent";
 const classnames = require("resource://devtools/client/shared/classnames.js");
 
@@ -52,7 +52,7 @@ const FrameLocation = memo(
     const location = getFrameLocation(frame, shouldDisplayOriginalLocation);
     const filename = displayFullUrl
       ? getFileURL(location.source, false)
-      : getFilename(location.source);
+      : location.source.shortName;
     return React.createElement(
       "span",
       {
@@ -124,7 +124,7 @@ export default class FrameComponent extends Component {
     this.props.showFrameContextMenu(event, frame);
   }
 
-  onMouseDown(e, frame, selectedFrame) {
+  onMouseDown(e, frame) {
     if (e.button !== 0) {
       return;
     }
@@ -132,7 +132,7 @@ export default class FrameComponent extends Component {
     this.props.selectFrame(frame);
   }
 
-  onKeyUp(event, frame, selectedFrame) {
+  onKeyUp(event, frame) {
     if (event.key != "Enter") {
       return;
     }
@@ -167,12 +167,12 @@ export default class FrameComponent extends Component {
       {
         role: "listitem",
         key: frame.id,
-        className: className,
+        className,
         onMouseDown: e => this.onMouseDown(e, frame, selectedFrame),
         onKeyUp: e => this.onKeyUp(e, frame, selectedFrame),
         onContextMenu: disableContextMenu ? null : e => this.onContextMenu(e),
         tabIndex: 0,
-        title: title,
+        title,
       },
       frame.asyncCause &&
         React.createElement(
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Frames/Group.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/Group.js
index ab9f7073a7..a4ec7f72da 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Frames/Group.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Frames/Group.js
@@ -110,18 +110,18 @@ export default class Group extends Component {
       },
       group.map(frame =>
         React.createElement(FrameComponent, {
-          frame: frame,
-          showFrameContextMenu: showFrameContextMenu,
+          frame,
+          showFrameContextMenu,
           hideLocation: true,
           key: frame.id,
-          selectedFrame: selectedFrame,
-          selectFrame: selectFrame,
-          selectLocation: selectLocation,
+          selectedFrame,
+          selectFrame,
+          selectLocation,
           shouldMapDisplayName: false,
-          displayFullUrl: displayFullUrl,
-          getFrameTitle: getFrameTitle,
-          disableContextMenu: disableContextMenu,
-          panel: panel,
+          displayFullUrl,
+          getFrameTitle,
+          disableContextMenu,
+          panel,
           isInGroup: true,
         })
       )
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Frames/index.js b/devtools/client/debugger/src/components/SecondaryPanes/Frames/index.js
index d83b413a01..ff60270024 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Frames/index.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Frames/index.js
@@ -115,28 +115,28 @@ class Frames extends Component {
         frameOrGroup.id
           ? React.createElement(FrameComponent, {
               frame: frameOrGroup,
-              showFrameContextMenu: showFrameContextMenu,
-              selectFrame: selectFrame,
-              selectLocation: selectLocation,
-              selectedFrame: selectedFrame,
-              shouldDisplayOriginalLocation: shouldDisplayOriginalLocation,
+              showFrameContextMenu,
+              selectFrame,
+              selectLocation,
+              selectedFrame,
+              shouldDisplayOriginalLocation,
               key: String(frameOrGroup.id),
-              displayFullUrl: displayFullUrl,
-              getFrameTitle: getFrameTitle,
-              disableContextMenu: disableContextMenu,
-              panel: panel,
+              displayFullUrl,
+              getFrameTitle,
+              disableContextMenu,
+              panel,
             })
           : React.createElement(Group, {
               group: frameOrGroup,
-              showFrameContextMenu: showFrameContextMenu,
-              selectFrame: selectFrame,
-              selectLocation: selectLocation,
-              selectedFrame: selectedFrame,
+              showFrameContextMenu,
+              selectFrame,
+              selectLocation,
+              selectedFrame,
               key: frameOrGroup[0].id,
-              displayFullUrl: displayFullUrl,
-              getFrameTitle: getFrameTitle,
-              disableContextMenu: disableContextMenu,
-              panel: panel,
+              displayFullUrl,
+              getFrameTitle,
+              disableContextMenu,
+              panel,
             })
       )
     );
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frame.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frame.spec.js.snap
index 90a5b1f906..c4e6722629 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frame.spec.js.snap
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Frame.spec.js.snap
@@ -36,6 +36,8 @@ exports[`Frame getFrameTitle 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
           },
@@ -57,6 +59,8 @@ exports[`Frame getFrameTitle 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
             },
@@ -82,6 +86,8 @@ exports[`Frame getFrameTitle 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
           },
@@ -103,6 +109,8 @@ exports[`Frame getFrameTitle 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
             },
@@ -135,6 +143,8 @@ exports[`Frame getFrameTitle 1`] = `
           "isOriginal": false,
           "isPrettyPrinted": false,
           "isWasm": false,
+          "longName": "foo-view.js",
+          "shortName": "foo-view.js",
           "thread": "FakeThread",
           "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
         },
@@ -178,6 +188,8 @@ exports[`Frame getFrameTitle 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
           },
@@ -199,6 +211,8 @@ exports[`Frame getFrameTitle 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
             },
@@ -224,6 +238,8 @@ exports[`Frame getFrameTitle 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
           },
@@ -245,6 +261,8 @@ exports[`Frame getFrameTitle 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
             },
@@ -277,6 +295,8 @@ exports[`Frame getFrameTitle 1`] = `
           "isOriginal": false,
           "isPrettyPrinted": false,
           "isWasm": false,
+          "longName": "foo-view.js",
+          "shortName": "foo-view.js",
           "thread": "FakeThread",
           "url": "https://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com/assets/src/js/foo-view.js",
         },
@@ -328,6 +348,8 @@ exports[`Frame library frame 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "backbone.js",
+            "shortName": "backbone.js",
             "thread": "FakeThread",
             "url": "backbone.js",
           },
@@ -349,6 +371,8 @@ exports[`Frame library frame 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "backbone.js",
+              "shortName": "backbone.js",
               "thread": "FakeThread",
               "url": "backbone.js",
             },
@@ -375,6 +399,8 @@ exports[`Frame library frame 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "backbone.js",
+            "shortName": "backbone.js",
             "thread": "FakeThread",
             "url": "backbone.js",
           },
@@ -396,6 +422,8 @@ exports[`Frame library frame 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "backbone.js",
+              "shortName": "backbone.js",
               "thread": "FakeThread",
               "url": "backbone.js",
             },
@@ -428,6 +456,8 @@ exports[`Frame library frame 1`] = `
           "isOriginal": false,
           "isPrettyPrinted": false,
           "isWasm": false,
+          "longName": "backbone.js",
+          "shortName": "backbone.js",
           "thread": "FakeThread",
           "url": "backbone.js",
         },
@@ -471,6 +501,8 @@ exports[`Frame library frame 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "backbone.js",
+            "shortName": "backbone.js",
             "thread": "FakeThread",
             "url": "backbone.js",
           },
@@ -492,6 +524,8 @@ exports[`Frame library frame 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "backbone.js",
+              "shortName": "backbone.js",
               "thread": "FakeThread",
               "url": "backbone.js",
             },
@@ -518,6 +552,8 @@ exports[`Frame library frame 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "backbone.js",
+            "shortName": "backbone.js",
             "thread": "FakeThread",
             "url": "backbone.js",
           },
@@ -539,6 +575,8 @@ exports[`Frame library frame 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "backbone.js",
+              "shortName": "backbone.js",
               "thread": "FakeThread",
               "url": "backbone.js",
             },
@@ -571,6 +609,8 @@ exports[`Frame library frame 1`] = `
           "isOriginal": false,
           "isPrettyPrinted": false,
           "isWasm": false,
+          "longName": "backbone.js",
+          "shortName": "backbone.js",
           "thread": "FakeThread",
           "url": "backbone.js",
         },
@@ -622,6 +662,8 @@ exports[`Frame user frame (not selected) 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "foo-view.js",
           },
@@ -643,6 +685,8 @@ exports[`Frame user frame (not selected) 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "foo-view.js",
             },
@@ -668,6 +712,8 @@ exports[`Frame user frame (not selected) 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "foo-view.js",
           },
@@ -689,6 +735,8 @@ exports[`Frame user frame (not selected) 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "foo-view.js",
             },
@@ -721,6 +769,8 @@ exports[`Frame user frame (not selected) 1`] = `
           "isOriginal": false,
           "isPrettyPrinted": false,
           "isWasm": false,
+          "longName": "foo-view.js",
+          "shortName": "foo-view.js",
           "thread": "FakeThread",
           "url": "foo-view.js",
         },
@@ -764,6 +814,8 @@ exports[`Frame user frame (not selected) 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "foo-view.js",
           },
@@ -785,6 +837,8 @@ exports[`Frame user frame (not selected) 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "foo-view.js",
             },
@@ -810,6 +864,8 @@ exports[`Frame user frame (not selected) 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "foo-view.js",
           },
@@ -831,6 +887,8 @@ exports[`Frame user frame (not selected) 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "foo-view.js",
             },
@@ -863,6 +921,8 @@ exports[`Frame user frame (not selected) 1`] = `
           "isOriginal": false,
           "isPrettyPrinted": false,
           "isWasm": false,
+          "longName": "foo-view.js",
+          "shortName": "foo-view.js",
           "thread": "FakeThread",
           "url": "foo-view.js",
         },
@@ -914,6 +974,8 @@ exports[`Frame user frame 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "foo-view.js",
           },
@@ -935,6 +997,8 @@ exports[`Frame user frame 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "foo-view.js",
             },
@@ -960,6 +1024,8 @@ exports[`Frame user frame 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "foo-view.js",
           },
@@ -981,6 +1047,8 @@ exports[`Frame user frame 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "foo-view.js",
             },
@@ -1013,6 +1081,8 @@ exports[`Frame user frame 1`] = `
           "isOriginal": false,
           "isPrettyPrinted": false,
           "isWasm": false,
+          "longName": "foo-view.js",
+          "shortName": "foo-view.js",
           "thread": "FakeThread",
           "url": "foo-view.js",
         },
@@ -1056,6 +1126,8 @@ exports[`Frame user frame 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "foo-view.js",
           },
@@ -1077,6 +1149,8 @@ exports[`Frame user frame 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "foo-view.js",
             },
@@ -1102,6 +1176,8 @@ exports[`Frame user frame 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "foo-view.js",
+            "shortName": "foo-view.js",
             "thread": "FakeThread",
             "url": "foo-view.js",
           },
@@ -1123,6 +1199,8 @@ exports[`Frame user frame 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "foo-view.js",
+              "shortName": "foo-view.js",
               "thread": "FakeThread",
               "url": "foo-view.js",
             },
@@ -1155,6 +1233,8 @@ exports[`Frame user frame 1`] = `
           "isOriginal": false,
           "isPrettyPrinted": false,
           "isWasm": false,
+          "longName": "foo-view.js",
+          "shortName": "foo-view.js",
           "thread": "FakeThread",
           "url": "foo-view.js",
         },
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Group.spec.js.snap b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Group.spec.js.snap
index 97c4c2ad1a..21a5321ba1 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Group.spec.js.snap
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Frames/tests/__snapshots__/Group.spec.js.snap
@@ -37,6 +37,8 @@ exports[`Group displays a group 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -58,6 +60,8 @@ exports[`Group displays a group 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -84,6 +88,8 @@ exports[`Group displays a group 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -105,6 +111,8 @@ exports[`Group displays a group 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -137,6 +145,8 @@ exports[`Group displays a group 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "url",
+            "shortName": "url",
             "thread": "FakeThread",
             "url": "url",
           },
@@ -199,6 +209,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -220,6 +232,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -246,6 +260,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -267,6 +283,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -299,6 +317,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "mahscripts.js",
+            "shortName": "mahscripts.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/mahscripts.js",
           },
@@ -348,6 +368,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -369,6 +391,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -395,6 +419,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -416,6 +442,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -448,6 +476,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "mahscripts.js",
+            "shortName": "mahscripts.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/mahscripts.js",
           },
@@ -485,6 +515,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -506,6 +538,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -532,6 +566,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -553,6 +589,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -585,6 +623,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "url",
+            "shortName": "url",
             "thread": "FakeThread",
             "url": "url",
           },
@@ -620,6 +660,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "back.js",
+              "shortName": "back.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/back.js",
             },
@@ -641,6 +683,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "back.js",
+                "shortName": "back.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/back.js",
               },
@@ -667,6 +711,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "back.js",
+              "shortName": "back.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/back.js",
             },
@@ -688,6 +734,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "back.js",
+                "shortName": "back.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/back.js",
               },
@@ -720,6 +768,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "back.js",
+            "shortName": "back.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/back.js",
           },
@@ -757,6 +807,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -778,6 +830,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -804,6 +858,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -825,6 +881,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -857,6 +915,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "url",
+            "shortName": "url",
             "thread": "FakeThread",
             "url": "url",
           },
@@ -892,6 +952,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "back.js",
+              "shortName": "back.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/back.js",
             },
@@ -913,6 +975,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "back.js",
+                "shortName": "back.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/back.js",
               },
@@ -939,6 +1003,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "back.js",
+              "shortName": "back.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/back.js",
             },
@@ -960,6 +1026,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "back.js",
+                "shortName": "back.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/back.js",
               },
@@ -992,6 +1060,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "back.js",
+            "shortName": "back.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/back.js",
           },
@@ -1029,6 +1099,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -1050,6 +1122,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -1076,6 +1150,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -1097,6 +1173,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -1129,6 +1207,8 @@ exports[`Group passes the getFrameTitle prop to the Frame components 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "url",
+            "shortName": "url",
             "thread": "FakeThread",
             "url": "url",
           },
@@ -1181,6 +1261,8 @@ exports[`Group renders group with anonymous functions 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -1202,6 +1284,8 @@ exports[`Group renders group with anonymous functions 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -1228,6 +1312,8 @@ exports[`Group renders group with anonymous functions 1`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -1249,6 +1335,8 @@ exports[`Group renders group with anonymous functions 1`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -1281,6 +1369,8 @@ exports[`Group renders group with anonymous functions 1`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "mahscripts.js",
+            "shortName": "mahscripts.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/mahscripts.js",
           },
@@ -1343,6 +1433,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -1364,6 +1456,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -1390,6 +1484,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -1411,6 +1507,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -1443,6 +1541,8 @@ exports[`Group renders group with anonymous functions 2`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "mahscripts.js",
+            "shortName": "mahscripts.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/mahscripts.js",
           },
@@ -1492,6 +1592,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -1513,6 +1615,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -1539,6 +1643,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "mahscripts.js",
+              "shortName": "mahscripts.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/mahscripts.js",
             },
@@ -1560,6 +1666,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "mahscripts.js",
+                "shortName": "mahscripts.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/mahscripts.js",
               },
@@ -1592,6 +1700,8 @@ exports[`Group renders group with anonymous functions 2`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "mahscripts.js",
+            "shortName": "mahscripts.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/mahscripts.js",
           },
@@ -1628,6 +1738,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -1649,6 +1761,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -1675,6 +1789,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -1696,6 +1812,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -1728,6 +1846,8 @@ exports[`Group renders group with anonymous functions 2`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "url",
+            "shortName": "url",
             "thread": "FakeThread",
             "url": "url",
           },
@@ -1763,6 +1883,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "back.js",
+              "shortName": "back.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/back.js",
             },
@@ -1784,6 +1906,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "back.js",
+                "shortName": "back.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/back.js",
               },
@@ -1810,6 +1934,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "back.js",
+              "shortName": "back.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/back.js",
             },
@@ -1831,6 +1957,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "back.js",
+                "shortName": "back.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/back.js",
               },
@@ -1863,6 +1991,8 @@ exports[`Group renders group with anonymous functions 2`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "back.js",
+            "shortName": "back.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/back.js",
           },
@@ -1899,6 +2029,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -1920,6 +2052,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -1946,6 +2080,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -1967,6 +2103,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -1999,6 +2137,8 @@ exports[`Group renders group with anonymous functions 2`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "url",
+            "shortName": "url",
             "thread": "FakeThread",
             "url": "url",
           },
@@ -2034,6 +2174,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "back.js",
+              "shortName": "back.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/back.js",
             },
@@ -2055,6 +2197,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "back.js",
+                "shortName": "back.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/back.js",
               },
@@ -2081,6 +2225,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "back.js",
+              "shortName": "back.js",
               "thread": "FakeThread",
               "url": "http://myfile.com/back.js",
             },
@@ -2102,6 +2248,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "back.js",
+                "shortName": "back.js",
                 "thread": "FakeThread",
                 "url": "http://myfile.com/back.js",
               },
@@ -2134,6 +2282,8 @@ exports[`Group renders group with anonymous functions 2`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "back.js",
+            "shortName": "back.js",
             "thread": "FakeThread",
             "url": "http://myfile.com/back.js",
           },
@@ -2170,6 +2320,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -2191,6 +2343,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -2217,6 +2371,8 @@ exports[`Group renders group with anonymous functions 2`] = `
               "isOriginal": false,
               "isPrettyPrinted": false,
               "isWasm": false,
+              "longName": "url",
+              "shortName": "url",
               "thread": "FakeThread",
               "url": "url",
             },
@@ -2238,6 +2394,8 @@ exports[`Group renders group with anonymous functions 2`] = `
                 "isOriginal": false,
                 "isPrettyPrinted": false,
                 "isWasm": false,
+                "longName": "url",
+                "shortName": "url",
                 "thread": "FakeThread",
                 "url": "url",
               },
@@ -2270,6 +2428,8 @@ exports[`Group renders group with anonymous functions 2`] = `
             "isOriginal": false,
             "isPrettyPrinted": false,
             "isWasm": false,
+            "longName": "url",
+            "shortName": "url",
             "thread": "FakeThread",
             "url": "url",
           },
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js b/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js
index 135decd254..65e4d19032 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js
@@ -307,7 +307,7 @@ class Scopes extends PureComponent {
           dimTopLevelWindow: true,
           frame: selectedFrame,
           mayUseCustomFormatter: true,
-          openLink: openLink,
+          openLink,
           onDOMNodeClick: grip => openElementInInspector(grip),
           onInspectIconClick: grip => openElementInInspector(grip),
           onDOMNodeMouseOver: grip => highlightDomElement(grip),
@@ -315,7 +315,7 @@ class Scopes extends PureComponent {
           onContextMenu: this.onContextMenu,
           setExpanded: (path, expand) =>
             setExpandedScope(selectedFrame, path, expand),
-          initiallyExpanded: initiallyExpanded,
+          initiallyExpanded,
           renderItemActions: this.renderWatchpointButton,
           shouldRenderTooltip: true,
         })
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Threads.js b/devtools/client/debugger/src/components/SecondaryPanes/Threads.js
index 2d21a1dcc5..f1426c95cb 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/Threads.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/Threads.js
@@ -25,7 +25,7 @@ export class Threads extends Component {
       },
       threads.map(thread =>
         React.createElement(Thread, {
-          thread: thread,
+          thread,
           key: thread.actor,
         })
       )
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.js b/devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.js
index 9774255dcd..f0b86a5f5c 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.js
@@ -164,7 +164,7 @@ class XHRBreakpoints extends Component {
     this.setState({ focused: true, editing: true });
   };
 
-  onMouseDown = e => {
+  onMouseDown = () => {
     this.setState({ editing: false, clickedOnFormElement: true });
   };
 
@@ -205,12 +205,12 @@ class XHRBreakpoints extends Component {
         className: classnames("xhr-input-container xhr-input-form", {
           focused,
         }),
-        onSubmit: onSubmit,
+        onSubmit,
       },
       input({
         className: "xhr-input-url",
         type: "text",
-        placeholder: placeholder,
+        placeholder,
         onChange: this.handleChange,
         onBlur: this.hideInput,
         onFocus: this.onFocus,
@@ -262,7 +262,7 @@ class XHRBreakpoints extends Component {
         className: "xhr-container",
         key: `${path}-${method}`,
         title: path,
-        onDoubleClick: (items, options) => this.editExpression(index),
+        onDoubleClick: () => this.editExpression(index),
       },
       label(
         null,
@@ -290,7 +290,7 @@ class XHRBreakpoints extends Component {
             className: "xhr-container__close-btn",
           },
           React.createElement(CloseButton, {
-            handleClick: e => removeXHRBreakpoint(index),
+            handleClick: () => removeXHRBreakpoint(index),
           })
         )
       )
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/index.js b/devtools/client/debugger/src/components/SecondaryPanes/index.js
index 20830afc12..52d0d3298e 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/index.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/index.js
@@ -52,7 +52,7 @@ const classnames = require("resource://devtools/client/shared/classnames.js");
 function debugBtn(onClick, type, className, tooltip) {
   return button(
     {
-      onClick: onClick,
+      onClick,
       className: `${type} ${className}`,
       key: type,
       title: tooltip,
@@ -136,7 +136,7 @@ class SecondaryPanes extends Component {
         },
         "plus",
         "active",
-        L10N.getStr("expressions.placeholder")
+        L10N.getStr("expressions.placeholder2")
       )
     );
     return buttons;
@@ -214,7 +214,7 @@ class SecondaryPanes extends Component {
           input({
             type: "checkbox",
             checked: mapScopesEnabled ? "checked" : "",
-            onChange: e => this.props.toggleMapScopes(),
+            onChange: () => this.props.toggleMapScopes(),
           }),
           L10N.getStr("scopes.showOriginalScopes")
         ),
@@ -249,7 +249,7 @@ class SecondaryPanes extends Component {
           input({
             type: "checkbox",
             checked: logEventBreakpoints ? "checked" : "",
-            onChange: e => this.props.toggleEventLogging(),
+            onChange: () => this.props.toggleEventLogging(),
           }),
           L10N.getStr("eventlisteners.log")
         )
diff --git a/devtools/client/debugger/src/components/SecondaryPanes/tests/XHRBreakpoints.spec.js b/devtools/client/debugger/src/components/SecondaryPanes/tests/XHRBreakpoints.spec.js
index 532c95e4ad..de7ab02ebe 100644
--- a/devtools/client/debugger/src/components/SecondaryPanes/tests/XHRBreakpoints.spec.js
+++ b/devtools/client/debugger/src/components/SecondaryPanes/tests/XHRBreakpoints.spec.js
@@ -225,7 +225,7 @@ describe("XHR Breakpoints", function () {
     }
 
     // check each expected XHR Method to see if they match the actual methods
-    expectedXHRMethods.forEach((expectedMethod, i) => {
+    expectedXHRMethods.forEach(expectedMethod => {
       function compareMethods(actualMethod) {
         return expectedMethod === actualMethod;
       }