Bug 1366033 - Update Debugger Frontend (5/18). r=jdescottes

devtools/client/debugger/new/panel.js

@@ -65,7 +65,6 @@ DebuggerPanel.prototype = {
       };
     }
 
-    frames = frames.toJS();
     const selectedFrame = this._selectors.getSelectedFrame(this._getState());
     const selected = frames.findIndex(frame => frame.id == selectedFrame.id);
 

devtools/client/debugger/new/parser-worker.js

@@ -29197,7 +29197,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function isLexicalScope(path) {
-	  return isFunction(path) || t.isProgram(path);
+	  return t.isBlockStatement(path) || isFunction(path) || t.isProgram(path);
 	}
 
 	function getSymbols(source) {

devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js

@@ -68,7 +68,7 @@ registerCleanupFunction(function() {
   DebuggerServer = null;
 });
 
-add_task(function* () {
+add_task(function*() {
   gClient = initDebuggerClient();
 
   const [type] = yield gClient.connect();
@@ -82,7 +82,7 @@ add_task(function* () {
   // listen for a new source and global
   gThreadClient.addListener("newSource", onNewSource);
   gClient.addListener("newGlobal", onNewGlobal);
-  yield promise.all([ gNewGlobal.promise, gNewChromeSource.promise ]);
+  yield promise.all([gNewGlobal.promise, gNewChromeSource.promise]);
 
   yield resumeAndCloseConnection();
 });

devtools/client/debugger/new/test/mochitest/head.js

@@ -208,9 +208,11 @@ function assertPausedLocation(dbg, source, line) {
   is(getSelectedSource(getState()).get("id"), source.id);
 
   // Check the pause location
-  const location = getPause(getState()).getIn(["frame", "location"]);
-  is(location.get("sourceId"), source.id);
-  is(location.get("line"), line);
+  const pause = getPause(getState());
+  const location = pause && pause.frame && pause.frame.location;
+
+  is(location.sourceId, source.id);
+  is(location.line, line);
 
   // Check the debug line
   ok(
@@ -280,7 +282,7 @@ function waitForPaused(dbg) {
       }
       // Make sure the source text is completely loaded for the
       // source we are paused in.
-      const sourceId = pause.getIn(["frame", "location", "sourceId"]);
+      const sourceId = pause && pause.frame && pause.frame.location.sourceId;
       const sourceText = dbg.selectors.getSourceText(dbg.getState(), sourceId);
       return sourceText && !sourceText.get("loading");
     });

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

@@ -306,6 +306,18 @@ editor.conditionalPanel.close=Cancel edit breakpoint and close
 # for navigating to a source mapped location
 editor.jumpToMappedLocation1=Jump to %S location
 
+# LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the
+# context menu to disable framework grouping.
+framework.disableGrouping=Disable Framework Grouping
+
+# LOCALIZATION NOTE (framework.enableGrouping): This is the text that appears in the
+# context menu to enable framework grouping.
+framework.enableGrouping=Enable Framework Grouping
+
+# LOCALIZATION NOTE (framework.accesskey): Access key to toggle framework grouping from
+# the context menu.
+framework.accesskey=u
+
 # LOCALIZATION NOTE (generated): Source Map term for a server source location
 generated=generated
 

devtools/client/preferences/debugger.js

@@ -30,6 +30,7 @@ pref("devtools.debugger.ui.panes-visible-on-startup", false);
 pref("devtools.debugger.ui.variables-sorting-enabled", true);
 pref("devtools.debugger.ui.variables-only-enum-visible", false);
 pref("devtools.debugger.ui.variables-searchbox-visible", false);
+pref("devtools.debugger.ui.framework-grouping-on", true);
 pref("devtools.debugger.call-stack-visible", false);
 pref("devtools.debugger.scopes-visible", false);
 pref("devtools.debugger.start-panel-collapsed", false);