DevTools: [Persistence] sync working copies of UISourceCodes

third_party/WebKit/Source/devtools/front_end/persistence/Persistence.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /**
  * @unrestricted
  */
 Persistence.Persistence = class extends Common.Object {
   /**
    * @param {!Workspace.Workspace} workspace
    * @param {!Bindings.BreakpointManager} breakpointManager
@@ skipping 31 matching lines @@
 
     binding.network[Persistence.Persistence._binding] = binding;
     binding.fileSystem[Persistence.Persistence._binding] = binding;
 
     binding.fileSystem.forceLoadOnCheckContent();
 
     binding.network.addEventListener(
         Workspace.UISourceCode.Events.WorkingCopyCommitted, this._onWorkingCopyCommitted, this);
     binding.fileSystem.addEventListener(
         Workspace.UISourceCode.Events.WorkingCopyCommitted, this._onWorkingCopyCommitted, this);
+    binding.network.addEventListener(
+        Workspace.UISourceCode.Events.WorkingCopyChanged, this._onWorkingCopyChanged, this);
+    binding.fileSystem.addEventListener(
+        Workspace.UISourceCode.Events.WorkingCopyChanged, this._onWorkingCopyChanged, this);
 
     this._addFilePathBindingPrefixes(binding.fileSystem.url());
 
     this._moveBreakpoints(binding.fileSystem, binding.network);
     this.dispatchEventToListeners(Persistence.Persistence.Events.BindingCreated, binding);
   }
 
   /**
    * @param {!Persistence.PersistenceBinding} binding
    */
   _onBindingRemoved(binding) {
     if (binding.network.isDirty())

[dgozman, 2016/12/01 21:58:12]

Let's remove this one?

[lushnikov, 2016/12/02 02:51:36]

Done.

       binding.fileSystem.setWorkingCopy(binding.network.workingCopy());
 
     binding.network[Persistence.Persistence._binding] = null;
     binding.fileSystem[Persistence.Persistence._binding] = null;
 
     binding.network.removeEventListener(
         Workspace.UISourceCode.Events.WorkingCopyCommitted, this._onWorkingCopyCommitted, this);
     binding.fileSystem.removeEventListener(
         Workspace.UISourceCode.Events.WorkingCopyCommitted, this._onWorkingCopyCommitted, this);
+    binding.network.removeEventListener(
+        Workspace.UISourceCode.Events.WorkingCopyChanged, this._onWorkingCopyChanged, this);
+    binding.fileSystem.removeEventListener(
+        Workspace.UISourceCode.Events.WorkingCopyChanged, this._onWorkingCopyChanged, this);
 
     this._removeFilePathBindingPrefixes(binding.fileSystem.url());
 
     this._breakpointManager.copyBreakpoints(binding.network.url(), binding.fileSystem);
     this.dispatchEventToListeners(Persistence.Persistence.Events.BindingRemoved, binding);
   }
 
   /**
    * @param {!Common.Event} event
    */
+  _onWorkingCopyChanged(event) {
+    var uiSourceCode = /** @type {!Workspace.UISourceCode} */ (event.target);
+    var binding = uiSourceCode[Persistence.Persistence._binding];
+    if (!binding || binding[Persistence.Persistence._muteWorkingCopy])
+      return;
+    var other = binding.network === uiSourceCode ? binding.fileSystem : binding.network;
+    var target = Bindings.NetworkProject.targetForUISourceCode(binding.network);
+    if (target.isNodeJS()) {
+      var newContent = uiSourceCode.workingCopy();
+      other.requestContent()
+          .then(currentContent => this._rewrapNodeJSContent(binding, other, currentContent, newContent))

[dgozman, 2016/12/01 21:58:12]

Use workingCopy() instead of currentContent.

[lushnikov, 2016/12/02 02:51:36]

Done.

+          .then(newContent => setWorkingCopy.call(this, () => newContent));
+      return;
+    }
+
+    setWorkingCopy.call(this, () => uiSourceCode.workingCopy());
+
+    /**
+     * @param {function():string} workingCopyGetter
+     * @this {Persistence.Persistence}
+     */
+    function setWorkingCopy(workingCopyGetter) {
+      binding[Persistence.Persistence._muteWorkingCopy] = true;
+      other.setWorkingCopyGetter(() => uiSourceCode.workingCopy());

[dgozman, 2016/12/01 21:58:12]

workingCopyGetter

[lushnikov, 2016/12/02 02:51:36]

Done.

+      binding[Persistence.Persistence._muteWorkingCopy] = false;
+      this._contentSyncedForTest();
+    }
+  }
+
+  /**
+   * @param {!Common.Event} event
+   */
   _onWorkingCopyCommitted(event) {
     var uiSourceCode = /** @type {!Workspace.UISourceCode} */ (event.target);
     var binding = uiSourceCode[Persistence.Persistence._binding];
     if (!binding || binding[Persistence.Persistence._muteCommit])
       return;
     var newContent = /** @type {string} */ (event.data.content);
     var other = binding.network === uiSourceCode ? binding.fileSystem : binding.network;
     var target = Bindings.NetworkProject.targetForUISourceCode(binding.network);
     if (target.isNodeJS()) {
-      other.requestContent().then(
-          currentContent => this._syncNodeJSContent(binding, other, currentContent, newContent));
+      other.requestContent()
+          .then(currentContent => this._rewrapNodeJSContent(binding, other, currentContent, newContent))
+          .then(newContent => setContent.call(this, newContent));

[dgozman, 2016/12/01 21:58:12]

Let's not chain sync calls.

[lushnikov, 2016/12/02 02:51:36]

Done.

       return;
     }
-    binding[Persistence.Persistence._muteCommit] = true;
-    other.addRevision(newContent);
-    binding[Persistence.Persistence._muteCommit] = false;
-    this._contentSyncedForTest();
+    setContent.call(this, newContent);
+
+    /**
+     * @param {string} newContent
+     * @this {Persistence.Persistence}
+     */
+    function setContent(newContent) {
+      binding[Persistence.Persistence._muteCommit] = true;
+      other.addRevision(newContent);
+      binding[Persistence.Persistence._muteCommit] = false;
+      this._contentSyncedForTest();
+    }
   }
 
   /**
    * @param {!Persistence.PersistenceBinding} binding
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {string} currentContent
    * @param {string} newContent
+   * @return {string}
    */
-  _syncNodeJSContent(binding, uiSourceCode, currentContent, newContent) {
+  _rewrapNodeJSContent(binding, uiSourceCode, currentContent, newContent) {
     if (uiSourceCode === binding.fileSystem) {
       if (newContent.startsWith(Persistence.Persistence._NodePrefix) &&
           newContent.endsWith(Persistence.Persistence._NodeSuffix)) {
         newContent = newContent.substring(
             Persistence.Persistence._NodePrefix.length, newContent.length - Persistence.Persistence._NodeSuffix.length);
       }
       if (currentContent.startsWith(Persistence.Persistence._NodeShebang))
         newContent = Persistence.Persistence._NodeShebang + newContent;
     } else {
       if (newContent.startsWith(Persistence.Persistence._NodeShebang))
         newContent = newContent.substring(Persistence.Persistence._NodeShebang.length);
       if (currentContent.startsWith(Persistence.Persistence._NodePrefix) &&
           currentContent.endsWith(Persistence.Persistence._NodeSuffix))
         newContent = Persistence.Persistence._NodePrefix + newContent + Persistence.Persistence._NodeSuffix;
     }
-    binding[Persistence.Persistence._muteCommit] = true;
-    uiSourceCode.addRevision(newContent);
-    binding[Persistence.Persistence._muteCommit] = false;
-    this._contentSyncedForTest();
+    return newContent;
   }
 
   _contentSyncedForTest() {
   }
 
   /**
    * @param {!Workspace.UISourceCode} from
    * @param {!Workspace.UISourceCode} to
    */
   _moveBreakpoints(from, to) {
@@ skipping 75 matching lines @@
     return this._filePathPrefixesToBindingCount.has(filePath);
   }
 
   dispose() {
     this._mapping.dispose();
   }
 };
 
 Persistence.Persistence._binding = Symbol('Persistence.Binding');
 Persistence.Persistence._muteCommit = Symbol('Persistence.MuteCommit');
+Persistence.Persistence._muteWorkingCopy = Symbol('Persistence.MuteWorkingCopy');
 
 Persistence.Persistence._NodePrefix = '(function (exports, require, module, __filename, __dirname) { ';
 Persistence.Persistence._NodeSuffix = '\n});';
 Persistence.Persistence._NodeShebang = '#!/usr/bin/env node';
 
 Persistence.Persistence.Events = {
   BindingCreated: Symbol('BindingCreated'),
   BindingRemoved: Symbol('BindingRemoved')
 };
 
 /**
  * @unrestricted
  */
 Persistence.PersistenceBinding = class {
   /**
    * @param {!Workspace.UISourceCode} network
    * @param {!Workspace.UISourceCode} fileSystem
    * @param {boolean} exactMatch
    */
   constructor(network, fileSystem, exactMatch) {
     this.network = network;
     this.fileSystem = fileSystem;
     this.exactMatch = exactMatch;
   }
 };
 
 /** @type {!Persistence.Persistence} */
 Persistence.persistence;