DevTools: make CompilerScriptMapping / SASSSourceMapping manage UISourceCodes

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 UI.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, !Array<!Sources.NavigatorUISourceCodeTreeNode>>} */
-    this._uiSourceCodeNodes = new Map();
+    /** @type {!Multimap<!Workspace.UISourceCode, !Sources.NavigatorUISourceCodeTreeNode>} */
+    this._uiSourceCodeNodes = new Multimap();
     /** @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();
 
     this.element.addEventListener('contextmenu', this.handleContextMenu.bind(this), false);
@@ skipping 12 matching lines @@
       Persistence.persistence.addEventListener(
           Persistence.Persistence.Events.BindingCreated, this._onBindingCreated, this);
       Persistence.persistence.addEventListener(
           Persistence.Persistence.Events.BindingRemoved, this._onBindingRemoved, this);
     }
     SDK.targetManager.addEventListener(SDK.TargetManager.Events.NameChanged, this._targetNameChanged, this);
 
     SDK.targetManager.observeTargets(this);
     this._resetWorkspace(Workspace.workspace);
     this._workspace.uiSourceCodes().forEach(this._addUISourceCode.bind(this));
+    Bindings.networkProjectManager.addEventListener(
+        Bindings.NetworkProjectManager.Events.FrameAttributionChanged, this._frameAttributionChanged, this);
   }
 
   /**
    * @param {!UI.TreeElement} treeElement
    */
   static _treeElementOrder(treeElement) {
     if (treeElement._boostOrder)
       return 0;
 
     if (!Sources.NavigatorView._typeOrders) {
@@ skipping 88 matching lines @@
     this._addUISourceCode(binding.network);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onBindingChanged(event) {
     var binding = /** @type {!Persistence.PersistenceBinding} */ (event.data);
 
     // Update UISourceCode titles.
-    var networkNodes = this._uiSourceCodeNodes.get(binding.network) || [];
+    var networkNodes = this._uiSourceCodeNodes.get(binding.network);
     for (var networkNode of networkNodes)
       networkNode.updateTitle();
-    var fileSystemNodes = this._uiSourceCodeNodes.get(binding.fileSystem) || [];
+    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);
@@ skipping 36 matching lines @@
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {boolean}
    */
   accept(uiSourceCode) {
     return !uiSourceCode.project().isServiceProject();
   }
 
   /**
+   * @param {!Common.Event} event
+   */
+  _frameAttributionChanged(event) {
+    var uiSourceCode = /** @type {!Workspace.UISourceCode} */ (event.data.uiSourceCode);
+    var addedFrame = /** @type {?SDK.ResourceTreeFrame} */ (event.data.added);
+    var removedFrame = /** @type {?SDK.ResourceTreeFrame} */ (event.data.removed);
+    if (addedFrame)
+      this._addUISourceCodeNode(uiSourceCode, addedFrame);
+    if (removedFrame) {
+      var node = Array.from(this._uiSourceCodeNodes.get(uiSourceCode)).find(node => node.frame() === removedFrame);

[dgozman, 2017/05/11 23:55:16]

Why Array.from? It's already an array.

[lushnikov, 2017/05/12 01:18:00]

Nah, it's a set

+      this._removeUISourceCodeNode(node);
+    }
+  }
+
+  /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   _addUISourceCode(uiSourceCode) {
     if (!this.accept(uiSourceCode))
       return;
 
     var binding = Persistence.persistence.binding(uiSourceCode);
     if (!Runtime.experiments.isEnabled('persistence2') && binding && binding.network === uiSourceCode)
       return;
 
+    var frames = Bindings.NetworkProject.framesForUISourceCode(uiSourceCode);
+    if (frames.length) {
+      for (var frame of frames)
+        this._addUISourceCodeNode(uiSourceCode, frame);
+    } else {
+      this._addUISourceCodeNode(uiSourceCode, null);
+    }
+    this.uiSourceCodeAdded(uiSourceCode);
+  }
+
+  /**
+   * @param {!Workspace.UISourceCode} uiSourceCode
+   * @param {?SDK.ResourceTreeFrame} frame
+   */
+  _addUISourceCodeNode(uiSourceCode, frame) {
     var isFromSourceMap = uiSourceCode.contentType().isFromSourceMap();
     var path;
     if (uiSourceCode.project().type() === Workspace.projectTypes.FileSystem)
       path = Persistence.FileSystemWorkspaceBinding.relativePath(uiSourceCode).slice(0, -1);
     else
       path = Common.ParsedURL.extractPath(uiSourceCode.url()).split('/').slice(1, -1);
 
     var project = uiSourceCode.project();
     var target = Bindings.NetworkProject.targetForUISourceCode(uiSourceCode);
-    var frames = Bindings.NetworkProject.framesForUISourceCode(uiSourceCode);
-    var uiSourceCodeNodes = [];
-    if (frames.length) {
-      for (var frame of frames) {
-        var folderNode =
-            this._folderNode(uiSourceCode, project, target, frame, uiSourceCode.origin(), path, isFromSourceMap);
-        var uiSourceCodeNode = new Sources.NavigatorUISourceCodeTreeNode(this, uiSourceCode, frame);
-        folderNode.appendChild(uiSourceCodeNode);
-        uiSourceCodeNodes.push(uiSourceCodeNode);
-      }
-    } else {
-      var folderNode =
-          this._folderNode(uiSourceCode, project, target, null, uiSourceCode.origin(), path, isFromSourceMap);
-      var uiSourceCodeNode = new Sources.NavigatorUISourceCodeTreeNode(this, uiSourceCode, null);
-      folderNode.appendChild(uiSourceCodeNode);
-      uiSourceCodeNodes.push(uiSourceCodeNode);
-    }
-    this._uiSourceCodeNodes.set(uiSourceCode, uiSourceCodeNodes);
-    this.uiSourceCodeAdded(uiSourceCode);
+    var folderNode =
+        this._folderNode(uiSourceCode, project, target, frame, uiSourceCode.origin(), path, isFromSourceMap);
+    var uiSourceCodeNode = new Sources.NavigatorUISourceCodeTreeNode(this, uiSourceCode, frame);
+    folderNode.appendChild(uiSourceCodeNode);
+    this._uiSourceCodeNodes.set(uiSourceCode, uiSourceCodeNode);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   uiSourceCodeAdded(uiSourceCode) {
   }
 
   /**
    * @param {!Common.Event} event
@@ skipping 192 matching lines @@
     return (prettyURL || projectOrigin);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {boolean=} select
    * @return {?Sources.NavigatorUISourceCodeTreeNode}
    */
   revealUISourceCode(uiSourceCode, select) {
     var nodes = this._uiSourceCodeNodes.get(uiSourceCode);
-    if (!nodes)
+    var node = nodes.firstValue();
+    if (!node)
       return null;
     if (this._scriptsTree.selectedTreeElement)
       this._scriptsTree.selectedTreeElement.deselect();
     this._lastSelectedUISourceCode = uiSourceCode;
     // TODO(dgozman): figure out revealing multiple.
-    nodes[0].reveal(select);
-    return nodes[0];
+    node.reveal(select);
+    return node;
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {boolean} focusSource
    */
   _sourceSelected(uiSourceCode, focusSource) {
     this._lastSelectedUISourceCode = uiSourceCode;
     Common.Revealer.reveal(uiSourceCode, !focusSource);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   sourceDeleted(uiSourceCode) {
   }
 
+

[dgozman, 2017/05/11 23:55:16]

nit: extra blank line

[lushnikov, 2017/05/12 01:18:00]

Done.

   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   _removeUISourceCode(uiSourceCode) {
-    var nodes = this._uiSourceCodeNodes.get(uiSourceCode) || [];
-    for (var i = 0; i < nodes.length; i++) {
-      var node = nodes[i];
+    var nodes = this._uiSourceCodeNodes.get(uiSourceCode);
+    for (var node of nodes)
+      this._removeUISourceCodeNode(node);
+  }
 
-      var project = uiSourceCode.project();
-      var target = Bindings.NetworkProject.targetForUISourceCode(uiSourceCode);
-      var frame = node.frame();
+  /**
+   * @param {!Sources.NavigatorUISourceCodeTreeNode} node
+   */
+  _removeUISourceCodeNode(node) {
+    var uiSourceCode = node.uiSourceCode();
+    this._uiSourceCodeNodes.remove(uiSourceCode, node);

[dgozman, 2017/05/11 23:55:16]

You mutate the same collection in line 545. That's ok?

[lushnikov, 2017/05/12 01:18:00]

That's ok for sets (we have set here):
http://stackoverflow.com/questions/28306756/is-it-safe-to-delete-elements-in-...

+    var project = uiSourceCode.project();
+    var target = Bindings.NetworkProject.targetForUISourceCode(uiSourceCode);
+    var frame = node.frame();
 
-      var parentNode = node.parent;
+    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) {
+        this._discardFrame(/** @type {!SDK.ResourceTreeFrame} */ (frame));
+        break;
+      }
+
+      var folderId = this._folderNodeId(project, target, frame, uiSourceCode.origin(), node._folderPath);
+      this._subfolderNodes.delete(folderId);
       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) {
-          this._discardFrame(/** @type {!SDK.ResourceTreeFrame} */ (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() {
-    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();
-    }
+    for (var node of this._uiSourceCodeNodes.valuesArray())
+      node.dispose();
 
     this._scriptsTree.removeChildren();
     this._uiSourceCodeNodes.clear();
     this._subfolderNodes.clear();
     this._frameNodes.clear();
     this._rootNode.reset();
   }
 
   /**
    * @param {!Event} event
@@ skipping 1023 matching lines @@
   /**
    * @param {string} title
    * @override
    */
   setTitle(title) {
     this._title = title;
     if (this._treeElement)
       this._treeElement.title = this._title;
   }
 };