Bug 1463415 - Update Debugger Frontend v57. r=dwalsh

MozReview-Commit-ID: JArKRKwmWjF

devtools/client/debugger/new/README.mozilla

@@ -1,9 +1,9 @@
 This is the debugger.html project output.
 See https://github.com/devtools-html/debugger.html
 
-Version 56
+Version 57
 
-Comparison: https://github.com/devtools-html/debugger.html/compare/release-55...release-56
+Comparison: https://github.com/devtools-html/debugger.html/compare/release-56...release-57
 
 Packages:
 - babel-plugin-transform-es2015-modules-commonjs @6.26.2

devtools/client/debugger/new/dist/vendors.js

@@ -7975,11 +7975,12 @@ class Tree extends Component {
           return;
         }
 
-        const { explicitOriginalTarget } = nativeEvent;
+        const { relatedTarget } = nativeEvent;
+
         // Only set default focus to the first tree node if the focus came
         // from outside the tree (e.g. by tabbing to the tree from other
         // external elements).
-        if (explicitOriginalTarget !== this.treeRef && !this.treeRef.contains(explicitOriginalTarget)) {
+        if (relatedTarget !== this.treeRef && !this.treeRef.contains(relatedTarget)) {
           this._focus(traversal[0].item);
         }
       },
@@ -8044,13 +8045,6 @@ module.exports = "<!-- This Source Code Form is subject to the terms of the Mozi
 "use strict";
 /* WEBPACK VAR INJECTION */(function(process) {
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isDevelopment = isDevelopment;
-exports.isTesting = isTesting;
-exports.isFirefoxPanel = isFirefoxPanel;
-exports.isFirefox = isFirefox;
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/>. */
@@ -8066,7 +8060,7 @@ function isNode() {
 }
 
 function isDevelopment() {
-  if (!isNode && isBrowser()) {
+  if (!isNode() && isBrowser()) {
     const href = window.location ? window.location.href : "";
     return href.match(/^file:/) || href.match(/localhost:/);
   }
@@ -8086,6 +8080,13 @@ function isFirefox() {
   return (/firefox/i.test(navigator.userAgent)
   );
 }
+
+module.exports = {
+  isDevelopment,
+  isTesting,
+  isFirefoxPanel,
+  isFirefox
+};
 /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(120)))
 
 /***/ }),

devtools/client/debugger/new/src/components/Editor/Footer.js

@@ -149,8 +149,7 @@ class SourceFooter extends _react.PureComponent {
     } = this.props;
 
     if (mappedSource) {
-      const bundleSource = mappedSource.toJS();
-      const filename = (0, _source.getFilename)(bundleSource);
+      const filename = (0, _source.getFilename)(mappedSource);
       const tooltip = L10N.getFormatStr("sourceFooter.mappedSourceTooltip", filename);
       const title = L10N.getFormatStr("sourceFooter.mappedSource", filename);
       const mappedSourceLocation = {

devtools/client/debugger/new/src/components/Editor/Tab.js

@@ -137,8 +137,7 @@ class Tab extends _react.PureComponent {
       closeTab,
       source
     } = this.props;
-    const src = source.toJS();
-    const filename = (0, _source.getFilename)(src);
+    const filename = (0, _source.getFilename)(source);
     const sourceId = source.id;
     const active = selectedSource && sourceId == selectedSource.get("id") && !this.isProjectSearchEnabled() && !this.isSourceSearchEnabled();
     const isPrettyCode = (0, _source.isPretty)(source);
@@ -168,7 +167,7 @@ class Tab extends _react.PureComponent {
       key: sourceId,
       onMouseUp: handleTabClick,
       onContextMenu: e => this.onTabContextMenu(e, sourceId),
-      title: (0, _source.getFileURL)(src)
+      title: (0, _source.getFileURL)(source)
     }, _react2.default.createElement(_SourceIcon2.default, {
       source: source,
       shouldHide: icon => ["file", "javascript"].includes(icon)

devtools/client/debugger/new/src/components/Editor/Tabs.js

@@ -71,19 +71,19 @@ class Tabs extends _react.PureComponent {
       });
     };
 
-    this.renderDropdownSource = source => {
+    this.renderDropdownSource = sourceRecord => {
       const {
         selectSpecificSource
       } = this.props;
-      const filename = (0, _source.getFilename)(source.toJS());
+      const filename = (0, _source.getFilename)(sourceRecord);
 
-      const onClick = () => selectSpecificSource(source.id);
+      const onClick = () => selectSpecificSource(sourceRecord.id);
 
       return _react2.default.createElement("li", {
-        key: source.id,
+        key: sourceRecord.id,
         onClick: onClick
       }, _react2.default.createElement("img", {
-        className: `dropdown-icon ${this.getIconClass(source)}`
+        className: `dropdown-icon ${this.getIconClass(sourceRecord)}`
       }), filename);
     };
 
@@ -122,12 +122,12 @@ class Tabs extends _react.PureComponent {
     }));
   }
 
-  getIconClass(source) {
-    if ((0, _source.isPretty)(source)) {
+  getIconClass(sourceRecord) {
+    if ((0, _source.isPretty)(sourceRecord)) {
       return "prettyPrint";
     }
 
-    if (source.isBlackBoxed) {
+    if (sourceRecord.isBlackBoxed) {
       return "blackBox";
     }
 

devtools/client/debugger/new/src/components/Editor/index.js

@@ -631,7 +631,7 @@ const mapStateToProps = state => {
     hitCount: (0, _selectors.getHitCountForSource)(state, sourceId),
     coverageOn: (0, _selectors.getCoverageEnabled)(state),
     conditionalPanelLine: (0, _selectors.getConditionalPanelLine)(state),
-    symbols: (0, _selectors.getSymbols)(state, selectedSource && selectedSource.toJS())
+    symbols: (0, _selectors.getSymbols)(state, selectedSource)
   };
 };
 

devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints.js

@@ -140,7 +140,7 @@ class Breakpoints extends _react.Component {
       pauseOnExceptions
     } = this.props;
     const isEmpty = breakpoints.size == 0;
-    const exceptionsBox = createExceptionOption(L10N.getStr("pauseOnExceptionsItem"), shouldPauseOnExceptions, () => pauseOnExceptions(!shouldPauseOnExceptions, false), "breakpoints-exceptions");
+    const exceptionsBox = createExceptionOption(L10N.getStr("pauseOnExceptionsItem2"), shouldPauseOnExceptions, () => pauseOnExceptions(!shouldPauseOnExceptions, false), "breakpoints-exceptions");
     const ignoreCaughtBox = createExceptionOption(L10N.getStr("pauseOnCaughtExceptionsItem"), shouldPauseOnCaughtExceptions, () => pauseOnExceptions(true, !shouldPauseOnCaughtExceptions), "breakpoints-exceptions-caught");
     return _react2.default.createElement("div", {
       className: (0, _classnames2.default)("breakpoints-exceptions-options", {

devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.js

@@ -180,8 +180,10 @@ class CommandBar extends _react.Component {
 
     const isDisabled = !isPaused;
     return [(0, _CommandBarButton.debugBtn)(this.props.rewind, "rewind", "active", "Rewind Execution"), (0, _CommandBarButton.debugBtn)(() => this.props.resume, "resume", "active", L10N.getFormatStr("resumeButtonTooltip", formatKey("resume"))), _react2.default.createElement("div", {
+      key: "divider-1",
       className: "divider"
     }), (0, _CommandBarButton.debugBtn)(this.props.reverseStepOver, "reverseStepOver", "active", "Reverse step over"), (0, _CommandBarButton.debugBtn)(this.props.stepOver, "stepOver", "active", L10N.getFormatStr("stepOverTooltip", formatKey("stepOver")), isDisabled), _react2.default.createElement("div", {
+      key: "divider-2",
       className: "divider"
     }), (0, _CommandBarButton.debugBtn)(this.props.stepOut, "stepOut", "active", L10N.getFormatStr("stepOutTooltip", formatKey("stepOut")), isDisabled), (0, _CommandBarButton.debugBtn)(this.props.stepIn, "stepIn", "active", L10N.getFormatStr("stepInTooltip", formatKey("stepIn")), isDisabled)];
   }

devtools/client/debugger/new/src/utils/source.js

@@ -423,6 +423,11 @@ function getTextAtPosition(source, location) {
 
   const line = location.line;
   const column = location.column || 0;
+
+  if (source.isWasm) {
+    return "";
+  }
+
   const lineText = source.text.split("\n")[line - 1];
 
   if (!lineText) {

devtools/client/locales/en-US/debugger.properties

@@ -97,9 +97,9 @@ ignoreExceptionsItem=Ignore exceptions
 # item shown when a user is adding a new breakpoint.
 pauseOnUncaughtExceptionsItem=Pause on uncaught exceptions
 
-# LOCALIZATION NOTE (pauseOnExceptionsItem): The pause on exceptions checkbox description
+# LOCALIZATION NOTE (pauseOnExceptionsItem2): The pause on exceptions checkbox description
 # when the debugger will pause on all exceptions.
-pauseOnExceptionsItem=Pause on exceptions
+pauseOnExceptionsItem2=Pause on exceptions
 
 # LOCALIZATION NOTE (ignoreCaughtExceptionsItem): The pause on exceptions checkbox description
 # when the debugger will not pause on any caught exception

devtools/client/shared/components/reps/reps.js

@@ -4441,11 +4441,12 @@ class Tree extends Component {
           return;
         }
 
-        const { explicitOriginalTarget } = nativeEvent;
+        const { relatedTarget } = nativeEvent;
+
         // Only set default focus to the first tree node if the focus came
         // from outside the tree (e.g. by tabbing to the tree from other
         // external elements).
-        if (explicitOriginalTarget !== this.treeRef && !this.treeRef.contains(explicitOriginalTarget)) {
+        if (relatedTarget !== this.treeRef && !this.treeRef.contains(relatedTarget)) {
           this._focus(traversal[0].item);
         }
       },