DevTools: merge UISourceCode's parentPath, name, originURL and uri.

third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

 /*
  * Copyright (C) 2012 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 25 matching lines @@
 
     var scriptsOutlineElement = this.element.createChild("div", "navigator");
     this._scriptsTree = new TreeOutlineInShadow();
     this._scriptsTree.registerRequiredCSS("sources/navigatorView.css");
     this._scriptsTree.setComparator(WebInspector.NavigatorView._treeElementsCompare);
     this.element.appendChild(this._scriptsTree.element);
     this.setDefaultFocusedElement(this._scriptsTree.element);
 
     /** @type {!Map.<!WebInspector.UISourceCode, !WebInspector.NavigatorUISourceCodeTreeNode>} */
     this._uiSourceCodeNodes = new Map();
-    /** @type {!Map.<!WebInspector.NavigatorTreeNode, !Map.<string, !WebInspector.NavigatorFolderTreeNode>>} */
+    /** @type {!Map.<string, !WebInspector.NavigatorFolderTreeNode>} */
     this._subfolderNodes = new Map();
 
     this._rootNode = new WebInspector.NavigatorRootTreeNode(this);
     this._rootNode.populate();
 
     this.element.addEventListener("contextmenu", this.handleContextMenu.bind(this), false);
 }
 
 WebInspector.NavigatorView.Events = {
     ItemSelected: "ItemSelected",
@@ skipping 51 matching lines @@
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _addUISourceCode: function(uiSourceCode)
     {
         if (!this.accept(uiSourceCode))
             return;
         var isFromSourceMap = uiSourceCode.contentType().isFromSourceMap();
-        var projectNode = this._projectNode(uiSourceCode.project(), isFromSourceMap);
-        var folderNode = this._folderNode(projectNode, uiSourceCode.parentPath(), isFromSourceMap);
+        var path;
+        if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem)
+            path = WebInspector.FileSystemWorkspaceBinding.relativePath(uiSourceCode).slice(0, -1);
+        else
+            path = WebInspector.ParsedURL.splitURLIntoPathComponents(uiSourceCode.path()).slice(1, -1);
+        var folderNode = this._folderNode(uiSourceCode.project(), uiSourceCode.host(), path, isFromSourceMap);
         var uiSourceCodeNode = new WebInspector.NavigatorUISourceCodeTreeNode(this, uiSourceCode);
         this._uiSourceCodeNodes.set(uiSourceCode, uiSourceCodeNode);
         folderNode.appendChild(uiSourceCodeNode);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _uiSourceCodeAdded: function(event)
     {
@@ skipping 16 matching lines @@
     _projectRemoved: function(event)
     {
         var project = /** @type {!WebInspector.Project} */ (event.data);
         var uiSourceCodes = project.uiSourceCodes();
         for (var i = 0; i < uiSourceCodes.length; ++i)
             this._removeUISourceCode(uiSourceCodes[i]);
     },
 
     /**
      * @param {!WebInspector.Project} project
-     * @param {boolean} isFromSourceMap
-     * @return {!WebInspector.NavigatorTreeNode}
-     */
-    _projectNode: function(project, isFromSourceMap)
-    {
-        if (!project.displayName())
-            return this._rootNode;
-
-        var projectNode = this._rootNode.child(project.id());
-        if (!projectNode) {
-            projectNode = this._createProjectNode(project, isFromSourceMap);
-            this._rootNode.appendChild(projectNode);
-        }
-        return projectNode;
-    },
-
-    /**
-     * @param {!WebInspector.Project} project
-     * @param {boolean} isFromSourceMap
-     * @return {!WebInspector.NavigatorTreeNode}
-     */
-    _createProjectNode: function(project, isFromSourceMap)
-    {
-        var type;
-        if (isFromSourceMap)
-            type = WebInspector.NavigatorView.Types.SourceMapFolder;
-        else
-            type = project.type() === WebInspector.projectTypes.FileSystem ? WebInspector.NavigatorView.Types.FileSystem : WebInspector.NavigatorView.Types.Domain;
-        var projectNode = new WebInspector.NavigatorFolderTreeNode(this, project, project.id(), type, "", project.displayName());
-        return projectNode;
-    },
-
-    /**
-    * @param {!WebInspector.NavigatorTreeNode} projectNode
-     * @param {string} folderPath
+     * @param {string} projectHost
+     * @param {!Array<string>} path
      * @param {boolean} fromSourceMap
      * @return {!WebInspector.NavigatorTreeNode}
      */
-    _folderNode: function(projectNode, folderPath, fromSourceMap)
+    _folderNode: function(project, projectHost, path, fromSourceMap)
     {
-        if (!folderPath)
-            return projectNode;
+        if (project.type() === WebInspector.projectTypes.Snippets)
+            return this._rootNode;
 
-        var subfolderNodes = this._subfolderNodes.get(projectNode);
-        if (!subfolderNodes) {
-            subfolderNodes = /** @type {!Map.<string, !WebInspector.NavigatorFolderTreeNode>} */ (new Map());
-            this._subfolderNodes.set(projectNode, subfolderNodes);
-        }
-
-        var folderNode = subfolderNodes.get(folderPath);
+        var folderPath = path.join("/");
+        var folderId = project.id() + ":" + projectHost + ":" + folderPath;
+        var folderNode = this._subfolderNodes.get(folderId);
         if (folderNode)
             return folderNode;
 
-        var parentNode = projectNode;
-        var index = folderPath.lastIndexOf("/");
-        if (index !== -1)
-            parentNode = this._folderNode(projectNode, folderPath.substring(0, index), fromSourceMap);
+        var parentNode = path.length ? this._folderNode(project, projectHost, path.slice(0, -1), fromSourceMap) : this._rootNode;
 
-        var name = folderPath.substring(index + 1);
-        folderNode = new WebInspector.NavigatorFolderTreeNode(this, null, name, fromSourceMap ? WebInspector.NavigatorView.Types.SourceMapFolder : WebInspector.NavigatorView.Types.Folder, folderPath, name);
-        subfolderNodes.set(folderPath, folderNode);
+        var type = fromSourceMap ? WebInspector.NavigatorView.Types.SourceMapFolder : WebInspector.NavigatorView.Types.Folder;
+        var name = path[path.length - 1];

[dgozman, 2015/12/16 07:58:30]

peekLast

[pfeldman, 2015/12/16 18:02:18]

Acknowledged.

+        if (parentNode === this._rootNode) {
+            var target = WebInspector.NetworkProject.targetForProject(project);
+            if (target) {
+                name = this._computeProjectDisplayName(target, projectHost);
+                if (!fromSourceMap)
+                    type = WebInspector.NavigatorView.Types.Domain;
+            } else {
+                name = project.displayName();
+            }
+        }
+
+        folderNode = new WebInspector.NavigatorFolderTreeNode(this, project, folderId, type, folderPath, name);
+        this._subfolderNodes.set(folderId, folderNode);
         parentNode.appendChild(folderNode);
         return folderNode;
     },
 
     /**
+     * @param {!WebInspector.Target} target
+     * @param {string} projectHost
+     * @return {string}
+     */
+    _computeProjectDisplayName: function(target, projectHost)
+    {
+        for (var context of target.runtimeModel.executionContexts()) {
+            if (context.name && context.origin && projectHost.startsWith(context.origin))
+                return context.name;
+        }
+
+        var targetSuffix = target.isPage() ? "" : " \u2014 " + target.name();
+        if (!projectHost)
+            return WebInspector.UIString("(no domain)") + targetSuffix;
+        var parsedURL = new WebInspector.ParsedURL(projectHost);
+        var prettyURL = parsedURL.isValid ? parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : "") : "";
+        return (prettyURL || projectHost) + targetSuffix;
+    },
+
+    /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {boolean=} select
      */
     revealUISourceCode: function(uiSourceCode, select)
     {
         var node = this._uiSourceCodeNodes.get(uiSourceCode);
         if (!node)
             return;
         if (this._scriptsTree.selectedTreeElement)
             this._scriptsTree.selectedTreeElement.deselect();
@@ skipping 21 matching lines @@
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _removeUISourceCode: function(uiSourceCode)
     {
         var node = this._uiSourceCodeNodes.get(uiSourceCode);
         if (!node)
             return;
 
-        var projectNode = this._projectNode(uiSourceCode.project(), false);
-        var subfolderNodes = this._subfolderNodes.get(projectNode);
         var parentNode = node.parent;
         this._uiSourceCodeNodes.remove(uiSourceCode);
         parentNode.removeChild(node);
         node = parentNode;
 
         while (node) {
             parentNode = node.parent;
             if (!parentNode || !node.isEmpty())
                 break;
-            if (subfolderNodes)
-                subfolderNodes.remove(node._folderPath);
+            this._subfolderNodes.remove(uiSourceCode.project().id() + ":" + uiSourceCode.host() + ":" + node._folderPath);
             parentNode.removeChild(node);
             node = parentNode;
         }
     },
 
     reset: function()
     {
         var nodes = this._uiSourceCodeNodes.valuesArray();
         for (var i = 0; i < nodes.length; ++i)
             nodes[i].dispose();
@@ skipping 43 matching lines @@
 
     /**
      * @param {!WebInspector.Project} project
      * @param {string} path
      */
     _handleContextMenuExclude: function(project, path)
     {
         var shouldExclude = window.confirm(WebInspector.UIString("Are you sure you want to exclude this folder?"));
         if (shouldExclude) {
             WebInspector.startBatchUpdate();
-            project.excludeFolder(path);
+            project.excludeFolder("file:///" + path + "/");

[dgozman, 2015/12/16 07:58:30]

This looks bad. Can we just pass |path| and left FSWB handle file:/// part?

[pfeldman, 2015/12/16 18:02:18]

There are no "path"s in the Workspace / UISourceCode API anymore.

             WebInspector.endBatchUpdate();
         }
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _handleContextMenuDelete: function(uiSourceCode)
     {
         var shouldDelete = window.confirm(WebInspector.UIString("Are you sure you want to delete this file?"));
@@ skipping 22 matching lines @@
 
         contextMenu.show();
     },
 
     /**
      * @param {!Event} event
      * @param {!WebInspector.NavigatorFolderTreeNode} node
      */
     handleFolderContextMenu: function(event, node)
     {
+        var path = node._folderPath;
+        var project = node._project;
+
         var contextMenu = new WebInspector.ContextMenu(event);
-        var path = "/";
-        var projectNode = node;
-        while (projectNode.parent !== this._rootNode) {
-            path = "/" + projectNode.id + path;
-            projectNode = projectNode.parent;
-        }
 
-        var project = projectNode._project;
-
-        if (project.type() === WebInspector.projectTypes.FileSystem) {
+        if (project && project.type() === WebInspector.projectTypes.FileSystem) {
             contextMenu.appendItem(WebInspector.UIString.capitalize("Refresh"), this._handleContextMenuRefresh.bind(this, project, path));
             contextMenu.appendItem(WebInspector.UIString.capitalize("New ^file"), this._handleContextMenuCreate.bind(this, project, path));
             contextMenu.appendItem(WebInspector.UIString.capitalize("Exclude ^folder"), this._handleContextMenuExclude.bind(this, project, path));
         }
         contextMenu.appendSeparator();
         WebInspector.NavigatorView.appendAddFolderItem(contextMenu);
 
         function removeFolder()
         {
             var shouldRemove = window.confirm(WebInspector.UIString("Are you sure you want to remove this folder?"));
             if (shouldRemove)
                 project.remove();
         }
 
-        if (project.type() === WebInspector.projectTypes.FileSystem && node === projectNode) {
+        if (project.type() === WebInspector.projectTypes.FileSystem) {
             var removeFolderLabel = WebInspector.UIString.capitalize("Remove ^folder from ^workspace");
             contextMenu.appendItem(removeFolderLabel, removeFolder);
         }
 
         contextMenu.show();
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {boolean} deleteIfCanceled
@@ skipping 476 matching lines @@
 
     /**
      * @return {boolean}
      */
     isEmpty: function()
     {
         return !this._children.size;
     },
 
     /**
-     * @param {string} id
-     * @return {?WebInspector.NavigatorTreeNode}
-     */
-    child: function(id)
-    {
-        return this._children.get(id) || null;
-    },
-
-    /**
      * @return {!Array.<!WebInspector.NavigatorTreeNode>}
      */
     children: function()
     {
         return this._children.valuesArray();
     },
 
     /**
      * @param {!WebInspector.NavigatorTreeNode} node
      */
@@ skipping 55 matching lines @@
 }
 
 /**
  * @constructor
  * @extends {WebInspector.NavigatorTreeNode}
  * @param {!WebInspector.NavigatorView} navigatorView
  * @param {!WebInspector.UISourceCode} uiSourceCode
  */
 WebInspector.NavigatorUISourceCodeTreeNode = function(navigatorView, uiSourceCode)
 {
-    WebInspector.NavigatorTreeNode.call(this, uiSourceCode.name());
+    WebInspector.NavigatorTreeNode.call(this, uiSourceCode.project().id() + ":" + uiSourceCode.path());
     this._navigatorView = navigatorView;
     this._uiSourceCode = uiSourceCode;
     this._treeElement = null;
 }
 
 WebInspector.NavigatorUISourceCodeTreeNode.prototype = {
     /**
      * @return {!WebInspector.UISourceCode}
      */
     uiSourceCode: function()
@@ skipping 28 matching lines @@
         if (!this._treeElement)
             return;
 
         var titleText = this._uiSourceCode.displayName();
         if (!ignoreIsDirty && (this._uiSourceCode.isDirty() || this._uiSourceCode.hasUnsavedCommittedChanges()))
             titleText = "*" + titleText;
         var tooltip = titleText;
         if (this._uiSourceCode.contentType().isFromSourceMap())
             tooltip = WebInspector.UIString("%s (from source map)", this._uiSourceCode.displayName());
         this._treeElement.title = titleText;
-        this._treeElement.tooltip = tooltip;
+        this._treeElement.tooltip = this._uiSourceCode.originURL();

[dgozman, 2015/12/16 07:58:30]

(from source map) is now gone. Restore?

[pfeldman, 2015/12/16 18:02:18]

Okay

     },
 
     /**
      * @override
      * @return {boolean}
      */
     hasChildren: function()
     {
         return false;
     },
@@ skipping 234 matching lines @@
 
     willRemoveChild: function(node)
     {
         if (node._isMerged || !this.isPopulated())
             return;
         this._treeElement.removeChild(node._treeElement);
     },
 
     __proto__: WebInspector.NavigatorTreeNode.prototype
 }