Merge pull request #3098 from jasonLaster/6-5

Release a new version of the debugger

Author: jasonLaster

assets/module-manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "debugger.html",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "license": "MPL-2.0",
   "repository": {
     "url": "git://github.com/devtools-html/debugger.html.git",

package.json

@@ -1,6 +1,9 @@
 .editor-wrapper {
   --debug-line-background: rgba(226, 236, 247, 0.5);
   --debug-line-border: rgb(145, 188, 219);
+  --editor-searchbar-height: 27px;
+  --editor-second-searchbar-height: 27px;
+
 }
 
 .theme-dark .editor-wrapper {
@@ -20,10 +23,6 @@
   --theme-conditional-breakpoint-color: #ccd1d5;
 }
 
-.theme-firebug {
-  --theme-conditional-breakpoint-color: #ccd1d5;
-}
-
 .out-of-scope .CodeMirror-line,
 .out-of-scope .CodeMirror-linenumber {
   opacity: 0.8;

src/components/Editor/Editor.css

@@ -1,8 +1,6 @@
 .search-bar {
   display: flex;
   flex-direction: column;
-  --editor-searchbar-height: 27px;
-  --editor-second-searchbar-height: 27px;
 }
 
 .search-bar .search-field {

src/components/Editor/SearchBar.css

@@ -46,11 +46,16 @@ function getHiddenTabs(sourceTabs: SourcesList, sourceTabEls) {
     return Math.min(...topOffsets);
   }
 
-  const tabTopOffset = getTopOffset();
-  return sourceTabs.filter((tab, index) => {
+  function hasTopOffset(el) {
     // adding 10px helps account for cases where the tab might be offset by
     // styling such as selected tabs which don't have a border.
-    return sourceTabEls[index].getBoundingClientRect().top > tabTopOffset + 10;
+    const tabTopOffset = getTopOffset();
+    return el.getBoundingClientRect().top > tabTopOffset + 10;
+  }
+
+  return sourceTabs.filter((tab, index) => {
+    const element = sourceTabEls[index];
+    return element && hasTopOffset(element);
   });
 }
 

src/components/Editor/Tabs.js

@@ -46,7 +46,7 @@ class Outline extends Component {
 
     return dom.li(
       {
-        key: `${name}:${location.start.line}`,
+        key: `${name}:${location.start.line}:${location.start.column}`,
         className: "outline-list__element",
         onClick: () => this.selectItem(location)
       },

src/components/Outline.js

@@ -36,6 +36,13 @@ function getValue(expression) {
     };
   }
 
+  if (value.error) {
+    return {
+      path: value.from,
+      value: value.error
+    };
+  }
+
   if (typeof value.result == "object") {
     return {
       path: value.result.actor,

src/components/SecondaryPanes/Expressions.js

@@ -32,7 +32,7 @@
  * @parent mochitest
  */
 
-// shared-head.js handles
+// shared-head.js handles imports, constants, and utility functions
 Services.scriptloader.loadSubScript(
   "chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js",
   this