[DevTools] Prepare navigator to multiple nodes per UISourceCode.

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 22 matching lines @@
   constructor() {
     super();
     this.registerRequiredCSS('sources/navigatorView.css');
 
     this._scriptsTree = new TreeOutlineInShadow();
     this._scriptsTree.registerRequiredCSS('sources/navigatorTree.css');
     this._scriptsTree.setComparator(Sources.NavigatorView._treeElementsCompare);
     this.element.appendChild(this._scriptsTree.element);
     this.setDefaultFocusedElement(this._scriptsTree.element);
 
-    /** @type {!Map.<!Workspace.UISourceCode, !Sources.NavigatorUISourceCodeTreeNode>} */
+    /** @type {!Map.<!Workspace.UISourceCode, !Array<!Sources.NavigatorUISourceCodeTreeNode>>} */
     this._uiSourceCodeNodes = new Map();
     /** @type {!Map.<string, !Sources.NavigatorFolderTreeNode>} */
     this._subfolderNodes = new Map();
 
     this._rootNode = new Sources.NavigatorRootTreeNode(this);
     this._rootNode.populate();
 
     /** @type {!Map.<!SDK.ResourceTreeFrame, !Sources.NavigatorGroupTreeNode>} */
     this._frameNodes = new Map();
 
@@ skipping 127 matching lines @@
     this._addUISourceCode(binding.network);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onBindingChanged(event) {
     var binding = /** @type {!Persistence.PersistenceBinding} */ (event.data);
 
     // Update UISourceCode titles.
-    var networkNode = this._uiSourceCodeNodes.get(binding.network);
-    if (networkNode)
+    var networkNodes = this._uiSourceCodeNodes.get(binding.network) || [];
+    for (var networkNode of networkNodes)
       networkNode.updateTitle();
-    var fileSystemNode = this._uiSourceCodeNodes.get(binding.fileSystem);
-    if (fileSystemNode)
+    var fileSystemNodes = this._uiSourceCodeNodes.get(binding.fileSystem) || [];
+    for (var fileSystemNode of fileSystemNodes)
       fileSystemNode.updateTitle();
 
     // Update folder titles.
     var pathTokens = Persistence.FileSystemWorkspaceBinding.relativePath(binding.fileSystem);
     var folderPath = '';
     for (var i = 0; i < pathTokens.length - 1; ++i) {
       folderPath += pathTokens[i];
       var folderId =
           this._folderNodeId(binding.fileSystem.project(), null, null, binding.fileSystem.origin(), folderPath);
       var folderNode = this._subfolderNodes.get(folderId);
@@ skipping 19 matching lines @@
    * @param {!Workspace.Workspace} workspace
    */
   _resetWorkspace(workspace) {
     this._workspace = workspace;
     this._workspace.addEventListener(Workspace.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this);
     this._workspace.addEventListener(Workspace.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this);
     this._workspace.addEventListener(Workspace.Workspace.Events.ProjectRemoved, this._projectRemoved.bind(this), this);
   }
 
   /**
+   * @return {!Workspace.Workspace}
+   * @protected
+   */
+  workspace() {
+    return this._workspace;
+  }
+
+  /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {boolean}
    */
   accept(uiSourceCode) {
     return !uiSourceCode.project().isServiceProject();
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {?SDK.ResourceTreeFrame}
@@ skipping 26 matching lines @@
     else
       path = Common.ParsedURL.extractPath(uiSourceCode.url()).split('/').slice(1, -1);
 
     var project = uiSourceCode.project();
     var target = Bindings.NetworkProject.targetForUISourceCode(uiSourceCode);
     var frame = this._uiSourceCodeFrame(uiSourceCode);
 
     var folderNode =
         this._folderNode(uiSourceCode, project, target, frame, uiSourceCode.origin(), path, isFromSourceMap);
     var uiSourceCodeNode = new Sources.NavigatorUISourceCodeTreeNode(this, uiSourceCode);
-    this._uiSourceCodeNodes.set(uiSourceCode, uiSourceCodeNode);
+    this._uiSourceCodeNodes.set(uiSourceCode, [uiSourceCodeNode]);
     folderNode.appendChild(uiSourceCodeNode);
     this.uiSourceCodeAdded(uiSourceCode);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   uiSourceCodeAdded(uiSourceCode) {
   }
 
   /**
-   * @return {!Array<!Sources.NavigatorUISourceCodeTreeNode>}
-   */
-  uiSourceCodeNodes() {
-    return this._uiSourceCodeNodes.valuesArray();
-  }
-
-  /**
    * @param {!Common.Event} event
    */
   _uiSourceCodeAdded(event) {
     var uiSourceCode = /** @type {!Workspace.UISourceCode} */ (event.data);
     this._addUISourceCode(uiSourceCode);
   }
 
   /**
    * @param {!Common.Event} event
    */
@@ skipping 179 matching lines @@
 
     var parsedURL = new Common.ParsedURL(projectOrigin);
     var prettyURL = parsedURL.isValid ? parsedURL.host + (parsedURL.port ? (':' + parsedURL.port) : '') : '';
 
     return (prettyURL || projectOrigin);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {boolean=} select
+   * @return {?Sources.NavigatorUISourceCodeTreeNode}
    */
   revealUISourceCode(uiSourceCode, select) {
-    var node = this._uiSourceCodeNodes.get(uiSourceCode);
-    if (!node)
-      return;
+    var nodes = this._uiSourceCodeNodes.get(uiSourceCode);
+    if (!nodes)
+      return null;
     if (this._scriptsTree.selectedTreeElement)
       this._scriptsTree.selectedTreeElement.deselect();
     this._lastSelectedUISourceCode = uiSourceCode;
-    node.reveal(select);
+    // TODO(dgozman): figure out revealing multiple.
+    nodes[0].reveal(select);
+    return nodes[0];
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {boolean} focusSource
    */
   _sourceSelected(uiSourceCode, focusSource) {
     this._lastSelectedUISourceCode = uiSourceCode;
     Common.Revealer.reveal(uiSourceCode, !focusSource);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   sourceDeleted(uiSourceCode) {
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   _removeUISourceCode(uiSourceCode) {
-    var node = this._uiSourceCodeNodes.get(uiSourceCode);
-    if (!node)
-      return;
+    var nodes = this._uiSourceCodeNodes.get(uiSourceCode) || [];
+    for (var i = 0; i < nodes.length; i++) {
+      var node = nodes[i];
 
-    var project = uiSourceCode.project();
-    var target = Bindings.NetworkProject.targetForUISourceCode(uiSourceCode);
-    var frame = this._uiSourceCodeFrame(uiSourceCode);
+      var project = uiSourceCode.project();
+      var target = Bindings.NetworkProject.targetForUISourceCode(uiSourceCode);
+      var frame = this._uiSourceCodeFrame(uiSourceCode);
 
-    var parentNode = node.parent;
-    this._uiSourceCodeNodes.delete(uiSourceCode);
-    parentNode.removeChild(node);
-    node = parentNode;
-
-    while (node) {
-      parentNode = node.parent;
-      if (!parentNode || !node.isEmpty())
-        break;
-      if (!(node instanceof Sources.NavigatorGroupTreeNode || node instanceof Sources.NavigatorFolderTreeNode))
-        break;
-      if (node._type === Sources.NavigatorView.Types.Frame)
-        break;
-
-      var folderId = this._folderNodeId(project, target, frame, uiSourceCode.origin(), node._folderPath);
-      this._subfolderNodes.delete(folderId);
+      var parentNode = node.parent;
       parentNode.removeChild(node);
       node = parentNode;
+
+      while (node) {
+        parentNode = node.parent;
+        if (!parentNode || !node.isEmpty())
+          break;
+        if (!(node instanceof Sources.NavigatorGroupTreeNode || node instanceof Sources.NavigatorFolderTreeNode))
+          break;
+        if (node._type === Sources.NavigatorView.Types.Frame)
+          break;
+
+        var folderId = this._folderNodeId(project, target, frame, uiSourceCode.origin(), node._folderPath);
+        this._subfolderNodes.delete(folderId);
+        parentNode.removeChild(node);
+        node = parentNode;
+      }
     }
+    this._uiSourceCodeNodes.delete(uiSourceCode);
   }
 
   reset() {
-    var nodes = this._uiSourceCodeNodes.valuesArray();
-    for (var i = 0; i < nodes.length; ++i)
-      nodes[i].dispose();
+    for (var entry of this._uiSourceCodeNodes) {
+      var nodes = /** @type {!Array<!Sources.NavigatorUISourceCodeTreeNode>} */ (entry[1]);
+      for (var i = 0; i < nodes.length; i++)
+        nodes[i].dispose();
+    }
 
     this._scriptsTree.removeChildren();
     this._uiSourceCodeNodes.clear();
     this._subfolderNodes.clear();
     this._frameNodes.clear();
     this._rootNode.reset();
   }
 
   /**
    * @param {!Event} event
    */
   handleContextMenu(event) {
   }
 
   /**
    * @param {!Workspace.Project} project
    * @param {string} path
    * @param {!Workspace.UISourceCode=} uiSourceCode
    */
   _handleContextMenuCreate(project, path, uiSourceCode) {
     this.create(project, path, uiSourceCode);
   }
 
   /**
-   * @param {!Workspace.UISourceCode} uiSourceCode
+   * @param {!Sources.NavigatorUISourceCodeTreeNode} node
    */
-  _handleContextMenuRename(uiSourceCode) {
-    this.rename(uiSourceCode, false);
+  _handleContextMenuRename(node) {
+    this.rename(node, false);
   }
 
   /**
    * @param {!Workspace.Project} project
    * @param {string} path
    */
   _handleContextMenuExclude(project, path) {
     var shouldExclude = window.confirm(Common.UIString('Are you sure you want to exclude this folder?'));
     if (shouldExclude) {
       UI.startBatchUpdate();
       project.excludeFolder(Persistence.FileSystemWorkspaceBinding.completeURL(project, path));
       UI.endBatchUpdate();
     }
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   _handleContextMenuDelete(uiSourceCode) {
     var shouldDelete = window.confirm(Common.UIString('Are you sure you want to delete this file?'));
     if (shouldDelete)
       uiSourceCode.project().deleteFile(uiSourceCode.url());
   }
 
   /**
    * @param {!Event} event
-   * @param {!Workspace.UISourceCode} uiSourceCode
+   * @param {!Sources.NavigatorUISourceCodeTreeNode} node
    */
-  handleFileContextMenu(event, uiSourceCode) {
+  handleFileContextMenu(event, node) {
+    var uiSourceCode = node.uiSourceCode();
     var contextMenu = new UI.ContextMenu(event);
     contextMenu.appendApplicableItems(uiSourceCode);
     contextMenu.appendSeparator();
 
     var project = uiSourceCode.project();
     if (project.type() === Workspace.projectTypes.FileSystem) {
       var parentURL = uiSourceCode.parentURL();
-      contextMenu.appendItem(Common.UIString('Rename\u2026'), this._handleContextMenuRename.bind(this, uiSourceCode));
+      contextMenu.appendItem(Common.UIString('Rename\u2026'), this._handleContextMenuRename.bind(this, node));
       contextMenu.appendItem(
           Common.UIString('Make a copy\u2026'),
           this._handleContextMenuCreate.bind(this, project, parentURL, uiSourceCode));
       contextMenu.appendItem(Common.UIString('Delete'), this._handleContextMenuDelete.bind(this, uiSourceCode));
       contextMenu.appendSeparator();
     }
 
     contextMenu.show();
   }
 
@@ skipping 24 matching lines @@
 
     contextMenu.appendSeparator();
     Sources.NavigatorView.appendAddFolderItem(contextMenu);
     if (node instanceof Sources.NavigatorGroupTreeNode)
       contextMenu.appendItem(Common.UIString('Remove folder from workspace'), removeFolder);
 
     contextMenu.show();
   }
 
   /**
-   * @param {!Workspace.UISourceCode} uiSourceCode
+   * @param {!Sources.NavigatorUISourceCodeTreeNode} node
    * @param {boolean} deleteIfCanceled
+   * @protected
    */
-  rename(uiSourceCode, deleteIfCanceled) {
-    var node = this._uiSourceCodeNodes.get(uiSourceCode);
-    console.assert(node);
+  rename(node, deleteIfCanceled) {
+    var uiSourceCode = node.uiSourceCode();
     node.rename(callback.bind(this));
 
     /**
      * @this {Sources.NavigatorView}
      * @param {boolean} committed
      */
     function callback(committed) {
       if (!committed) {
         if (deleteIfCanceled)
           uiSourceCode.remove();
@@ skipping 35 matching lines @@
     }
 
     /**
      * @this {Sources.NavigatorView}
      * @param {?Workspace.UISourceCode} uiSourceCode
      */
     function fileCreated(uiSourceCode) {
       if (!uiSourceCode)
         return;
       this._sourceSelected(uiSourceCode, false);
-      this.revealUISourceCode(uiSourceCode, true);
-      this.rename(uiSourceCode, true);
+      var node = this.revealUISourceCode(uiSourceCode, true);
+      if (node)
+        this.rename(node, true);
     }
   }
 
   _groupingChanged() {
     this.reset();
     this._initGrouping();
     this._workspace.uiSourceCodes().forEach(this._addUISourceCode.bind(this));
   }
 
   _initGrouping() {
@@ skipping 171 matching lines @@
 };
 
 /**
  * @unrestricted
  */
 Sources.NavigatorSourceTreeElement = class extends TreeElement {
   /**
    * @param {!Sources.NavigatorView} navigatorView
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {string} title
+   * @param {!Sources.NavigatorUISourceCodeTreeNode} node
    */
-  constructor(navigatorView, uiSourceCode, title) {
+  constructor(navigatorView, uiSourceCode, title, node) {
     super('', false);
     this._nodeType = Sources.NavigatorView.Types.File;
+    this._node = node;
     this.title = title;
     this.listItemElement.classList.add(
         'navigator-' + uiSourceCode.contentType().name() + '-tree-item', 'navigator-file-tree-item');
     this.tooltip = uiSourceCode.url();
     this.createIcon();
 
     this._navigatorView = navigatorView;
     this._uiSourceCode = uiSourceCode;
   }
 
@@ skipping 42 matching lines @@
       super.selectOnMouseDown(event);
       return;
     }
     setTimeout(rename.bind(this), 300);
 
     /**
      * @this {Sources.NavigatorSourceTreeElement}
      */
     function rename() {
       if (this._shouldRenameOnMouseDown())
-        this._navigatorView.rename(this.uiSourceCode, false);
+        this._navigatorView.rename(this._node, false);
     }
   }
 
   _ondragstart(event) {
     event.dataTransfer.setData('text/plain', this._warmedUpContent);
     event.dataTransfer.effectAllowed = 'copy';
     return true;
   }
 
   /**
@@ skipping 38 matching lines @@
   ondelete() {
     this._navigatorView.sourceDeleted(this.uiSourceCode);
     return true;
   }
 
   /**
    * @param {!Event} event
    */
   _handleContextMenuEvent(event) {
     this.select();
-    this._navigatorView.handleFileContextMenu(event, this._uiSourceCode);
+    this._navigatorView.handleFileContextMenu(event, this._node);
   }
 };
 
 /**
  * @unrestricted
  */
 Sources.NavigatorTreeNode = class {
   /**
    * @param {string} id
    * @param {string} type
@@ skipping 176 matching lines @@
   }
 
   /**
    * @override
    * @return {!TreeElement}
    */
   treeNode() {
     if (this._treeElement)
       return this._treeElement;
 
-    this._treeElement = new Sources.NavigatorSourceTreeElement(this._navigatorView, this._uiSourceCode, '');
+    this._treeElement = new Sources.NavigatorSourceTreeElement(this._navigatorView, this._uiSourceCode, '', this);
     this.updateTitle();
 
     var updateTitleBound = this.updateTitle.bind(this, undefined);
     this._eventListeners = [
       this._uiSourceCode.addEventListener(Workspace.UISourceCode.Events.TitleChanged, updateTitleBound),
       this._uiSourceCode.addEventListener(Workspace.UISourceCode.Events.WorkingCopyChanged, updateTitleBound),
       this._uiSourceCode.addEventListener(Workspace.UISourceCode.Events.WorkingCopyCommitted, updateTitleBound)
     ];
     return this._treeElement;
   }
@@ skipping 343 matching lines @@
   /**
    * @param {string} title
    * @override
    */
   setTitle(title) {
     this._title = title;
     if (this._treeElement)
       this._treeElement.title = this._title;
   }
 };