DevTools: keep selected tab as persistence binding comes in

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

 /*
  * Copyright (C) 2011 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 73 matching lines @@
     var fileSystemTabId = this._tabIds.get(binding.fileSystem);
 
     var wasSelectedInNetwork = this._currentFile === binding.network;
     var currentSelectionRange = this._history.selectionRange(binding.network.url());
     var currentScrollLineNumber = this._history.scrollLineNumber(binding.network.url());
     this._history.remove(binding.network.url());
 
     if (!networkTabId)
       return;
 
-    var tabIndex = this._tabbedPane.tabIndex(networkTabId);
-    var tabsToClose = [networkTabId];
-    if (fileSystemTabId)
-      tabsToClose.push(fileSystemTabId);
-    this._closeTabs(tabsToClose, true);
-    fileSystemTabId = this._appendFileTab(binding.fileSystem, false, tabIndex);
-    this._updateHistory();
+    if (!fileSystemTabId) {

[dgozman, 2017/03/10 19:23:38]

Do we have to move filsystem in place of network otherwise?

+      var tabIndex = this._tabbedPane.tabIndex(networkTabId);
+      fileSystemTabId = this._appendFileTab(binding.fileSystem, false, tabIndex);
+      var fileSystemTabView = /** @type {!UI.Widget} */ (this._tabbedPane.tabView(fileSystemTabId));
+      this._restoreEditorProperties(fileSystemTabView, currentSelectionRange, currentScrollLineNumber);
+    }
 
+    this._closeTabs([networkTabId], true);
     if (wasSelectedInNetwork)
       this._tabbedPane.selectTab(fileSystemTabId, false);
 
-    var fileSystemTabView = /** @type {!UI.Widget} */ (this._tabbedPane.tabView(fileSystemTabId));
-    this._restoreEditorProperties(fileSystemTabView, currentSelectionRange, currentScrollLineNumber);
+    this._updateHistory();
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onBindingRemoved(event) {
     var binding = /** @type {!Persistence.PersistenceBinding} */ (event.data);
     this._updateFileTitle(binding.fileSystem);
   }
 
@@ skipping 691 matching lines @@
 
   /**
    * @override
    * @param {string} tabId
    * @param {!UI.ContextMenu} contextMenu
    */
   onContextMenu(tabId, contextMenu) {
     this._editorContainer._onContextMenu(tabId, contextMenu);
   }
 };