Show source tab for paused evals

jasonLaster · jbhoosreddy · commit d2284e3e8096 · 2017-01-13T18:46:06.000-06:00
diff --git a/src/components/SourceTabs.js b/src/components/SourceTabs.js
@@ -7,7 +7,7 @@ const {
   getSelectedSource, getSourceTabs,
   getFileSearchState, getSourceByURL
 } = require("../selectors");
-const { getFilename, getRawSourceURL, isPretty } = require("../utils/source");
+const { getFilename, isPretty } = require("../utils/source");
 const { isEnabled } = require("devtools-config");
 const classnames = require("classnames");
 const actions = require("../actions");
@@ -17,7 +17,6 @@ const Svg = require("./shared/Svg");
 const Dropdown = React.createFactory(require("./Dropdown"));
 const { showMenu, buildMenu } = require("../utils/menu");
 const { debounce } = require("lodash");
-const { getURL } = require("../utils/sources-tree.js");
 const { formatKeyShortcut } = require("../utils/text");
 require("./SourceTabs.css");
 require("./Dropdown.css");
@@ -257,7 +256,7 @@ const SourceTabs = React.createClass({
 
   renderTab(source) {
     const { selectedSource, selectSource, closeTab } = this.props;
-    const filename = getRawSourceURL(getURL(source.get("url")).filename);
+    const filename = getFilename(source.toJS());
     const active = source.get("id") == selectedSource.get("id");
     const isPrettyCode = isPretty({ url: source.get("url") });
 
@@ -275,7 +274,7 @@ const SourceTabs = React.createClass({
         key: source.get("id"),
         onClick: () => selectSource(source.get("id")),
         onContextMenu: (e) => this.onTabContextMenu(e, source.get("id")),
-        title: getRawSourceURL(source.get("url"))
+        title: getFilename(source.toJS())
       },
       isPrettyCode ? Svg("prettyPrint") : null,
       dom.div({ className: "filename" }, filename),
diff --git a/src/utils/source.js b/src/utils/source.js
@@ -75,13 +75,14 @@ function getRawSourceURL(url: string): string {
  * @static
  */
 function getFilename(source: Source) {
-  const { url, id } = source;
+  let { url, id } = source;
   if (!url) {
     const sourceId = id.split("/")[1];
     return `SOURCE${sourceId}`;
   }
 
-  const name = basename(source.url || "") || "(index)";
+  url = getRawSourceURL(url || "");
+  const name = basename(url) || "(index)";
   return endTruncateStr(name, 50);
 }
 
