DevTools: hoist debugger paused reason to top

third_party/WebKit/Source/devtools/front_end/components/DOMBreakpointsSidebarPane.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
     this._breakpointTypes = {
         SubtreeModified: "subtree-modified",
         AttributeModified: "attribute-modified",
         NodeRemoved: "node-removed"
     };
     this._breakpointTypeLabels = {};
     this._breakpointTypeLabels[this._breakpointTypes.SubtreeModified] = WebInspector.UIString("Subtree Modified");
     this._breakpointTypeLabels[this._breakpointTypes.AttributeModified] = WebInspector.UIString("Attribute Modified");
     this._breakpointTypeLabels[this._breakpointTypes.NodeRemoved] = WebInspector.UIString("Node Removed");
 
-    this._contextMenuLabels = {};
-    this._contextMenuLabels[this._breakpointTypes.SubtreeModified] = WebInspector.UIString.capitalize("Subtree ^modifications");
-    this._contextMenuLabels[this._breakpointTypes.AttributeModified] = WebInspector.UIString.capitalize("Attributes ^modifications");
-    this._contextMenuLabels[this._breakpointTypes.NodeRemoved] = WebInspector.UIString.capitalize("Node ^removal");
+    this._breakpointTypeNouns = {};
+    this._breakpointTypeNouns[this._breakpointTypes.SubtreeModified] = WebInspector.UIString.capitalize("Subtree ^modifications");
+    this._breakpointTypeNouns[this._breakpointTypes.AttributeModified] = WebInspector.UIString.capitalize("Attribute ^modifications");
+    this._breakpointTypeNouns[this._breakpointTypes.NodeRemoved] = WebInspector.UIString.capitalize("Node ^removal");
 
     WebInspector.targetManager.addModelListener(WebInspector.DOMModel, WebInspector.DOMModel.Events.NodeRemoved, this._nodeRemoved, this);
     this._update();
 }
 
 WebInspector.DOMBreakpointsSidebarPane.Marker = "breakpoint-marker";
 
 WebInspector.DOMBreakpointsSidebarPane.prototype = {
     /**
      * @param {!WebInspector.DOMNode} node
@@ skipping 16 matching lines @@
             if (!nodeBreakpoints.has(type))
                 this._setBreakpoint(node, type, true);
             else
                 this._removeBreakpoint(node, type);
             this._saveBreakpoints();
         }
 
         var breakpointsMenu = createSubMenu ? contextMenu.appendSubMenuItem(WebInspector.UIString("Break on...")) : contextMenu;
         for (var key in this._breakpointTypes) {
             var type = this._breakpointTypes[key];
-            var label = this._contextMenuLabels[type];
+            var label = this._breakpointTypeNouns[type];
             breakpointsMenu.appendCheckboxItem(label, toggleBreakpoint.bind(this, type), nodeBreakpoints.has(type));
         }
     },
 
     /**
      * @param {!WebInspector.DOMNode} node
      * @return {!Set<!DOMDebuggerAgent.DOMBreakpointType>}
      */
     _nodeBreakpoints: function(node)
     {
@@ skipping 16 matching lines @@
             if (element._node === node && element._checkboxElement.checked)
                 return true;
         }
         return false;
     },
 
     /**
      * @param {!WebInspector.DebuggerPausedDetails} details
      * @return {!Element}
      */
-    createBreakpointHitStatusMessage: function(details)
+    createBreakpointHitMainMessage: function(details)
     {
         var auxData = /** @type {!Object} */ (details.auxData);
-        var message = "Paused on a \"%s\" breakpoint.";
-        var substitutions = [];
-        substitutions.push(this._breakpointTypeLabels[auxData["type"]]);
+        var message = String.sprintf("Paused on %s", this._breakpointTypeNouns[auxData["type"]]);
+        var element = createElement("div");
+        element.textContent = message;
+        return element;
+    },
 
+    /**
+     * @param {!WebInspector.DebuggerPausedDetails} details
+     * @return {!Element}
+     */
+    createBreakpointHitSubMessage: function(details)

[lushnikov, 2016/10/12 21:26:58]

you don't need two functions - let's keep them as one

[luoe, 2016/10/13 00:36:58]

Done.

+    {
+        var element = createElement("div");
         var domModel = WebInspector.DOMModel.fromTarget(details.target());
         if (!domModel)
-            return WebInspector.formatLocalized(message, substitutions);
+            return element;
 
+        var auxData = /** @type {!Object} */ (details.auxData);
         var node = domModel.nodeForId(auxData["nodeId"]);
         var linkifiedNode = WebInspector.DOMPresentationUtils.linkifyNodeReference(node);
-        substitutions.push(linkifiedNode);
+        element.appendChild(linkifiedNode);
 
         var targetNode = auxData["targetNodeId"] ? domModel.nodeForId(auxData["targetNodeId"]) : null;
         var targetNodeLink = targetNode ? WebInspector.DOMPresentationUtils.linkifyNodeReference(targetNode) : "";
-
+        var message;
         if (auxData.type === this._breakpointTypes.SubtreeModified) {
-            if (auxData["insertion"]) {
-                if (targetNode !== node) {
-                    message = "Paused on a \"%s\" breakpoint set on %s, because a new child was added to its descendant %s.";
-                    substitutions.push(targetNodeLink);
-                } else
-                    message = "Paused on a \"%s\" breakpoint set on %s, because a new child was added to that node.";
-            } else {
-                message = "Paused on a \"%s\" breakpoint set on %s, because its descendant %s was removed.";
-                substitutions.push(targetNodeLink);
-            }
-        } else {
-            message = "Paused on a \"%s\" breakpoint set on %s.";
+            if (auxData["insertion"])
+                message = targetNode === node ? "Child %s added" : "Descendant %s added";
+            else
+                message = "Descendant %s removed";
+            element.appendChild(createElement("br"));
+            element.appendChild(WebInspector.formatLocalized(message, [targetNodeLink]));
         }
-
-        return WebInspector.formatLocalized(message, substitutions);
+        return element;
     },
 
     _nodeRemoved: function(event)
     {
         var node = event.data.node;
         this._removeBreakpointsForNode(event.data.node);
         var children = node.children();
         if (!children)
             return;
         for (var i = 0; i < children.length; ++i)
@@ skipping 249 matching lines @@
             pane.show(this.element);
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @type {!WebInspector.DOMBreakpointsSidebarPane}
  */
 WebInspector.domBreakpointsSidebarPane;