DevTools: properly support targets in LiveEditSupport

Source/devtools/front_end/sources/JavaScriptSourceFrame.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 262 matching lines @@
             var selection = this.textEditor.copyRange(textSelection);
             var addToWatchLabel = WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Add to watch" : "Add to Watch");
             contextMenu.appendItem(addToWatchLabel, this._innerAddToWatch.bind(this, selection));
             var evaluateLabel = WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Evaluate in console" : "Evaluate in Console");
             contextMenu.appendItem(evaluateLabel, this._evaluateInConsole.bind(this, selection));
             contextMenu.appendSeparator();
         } else if (this._uiSourceCode.project().type() === WebInspector.projectTypes.Debugger) {
             // FIXME: Change condition above to explicitly check that current uiSourceCode is created by default debugger mapping
             // and move the code adding this menu item to generic context menu provider for UISourceCode.
             var liveEditLabel = WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Live edit" : "Live Edit");
-            contextMenu.appendItem(liveEditLabel, liveEdit.bind(this));
+            var projectId = this._uiSourceCode.project().id();

[vsevik, 2014/06/26 14:16:19]

Let's make this static method in LiveEditSupport

[sergeyv, 2014/06/26 14:38:35]

Done.

+            var target;
+            var targets = WebInspector.targetManager.targets();
+            for (var i = 0; i < targets.length; ++i) {
+                if (projectId === WebInspector.DefaultScriptMapping.projectIdForTarget(targets[i])) {
+                    target = targets[i];
+                    break;
+                }
+            }
+            if (!target)
+                return;
+
+            contextMenu.appendItem(liveEditLabel, liveEdit.bind(this, target.liveEditSupport));
             contextMenu.appendSeparator();
         }
 
         /**
          * @this {WebInspector.JavaScriptSourceFrame}
+         * @param {!WebInspector.LiveEditSupport} liveEditSupport
          */
-        function liveEdit()
+        function liveEdit(liveEditSupport)
         {
-            var liveEditUISourceCode = WebInspector.liveEditSupport.uiSourceCodeForLiveEdit(this._uiSourceCode);
+            var liveEditUISourceCode = liveEditSupport.uiSourceCodeForLiveEdit(this._uiSourceCode);
             WebInspector.Revealer.reveal(liveEditUISourceCode.uiLocation(lineNumber));
         }
 
         WebInspector.UISourceCodeFrame.prototype.populateTextAreaContextMenu.call(this, contextMenu, lineNumber);
     },
 
     _workingCopyChanged: function(event)
     {
         if (this._supportsEnabledBreakpointsWhileEditing() || this._scriptFileForTarget.size())
             return;
 
         if (this._uiSourceCode.isDirty())
             this._muteBreakpointsWhileEditing();
         else
             this._restoreBreakpointsAfterEditing();
     },
 
     _workingCopyCommitted: function(event)
     {
+
+        var callbackCount;

[vsevik, 2014/06/26 14:16:19]

redundant

[sergeyv, 2014/06/26 14:38:35]

Done.

+        var liveEditError;
+        var liveEditErrorData;
+        var contextScript;
+        var succeededEdits = 0;
+        var failedEdits = 0;
+
+        /**
+         * @param {?string} error
+         * @param {!DebuggerAgent.SetScriptSourceError=} errorData
+         * @param {!WebInspector.Script=} script
+         */
+        function liveEditCallback(error, errorData, script)
+        {
+            if (error) {
+                liveEditError = error;
+                liveEditErrorData = errorData;
+                contextScript = script;
+                failedEdits--;

[vsevik, 2014/06/26 14:16:19]

++

[sergeyv, 2014/06/26 14:38:35]

Done.

+            } else
+                succeededEdits++;
+
+            if (succeededEdits + failedEdits !== callbackCount)
+                return;
+
+            if (succeededEdits === callbackCount)

[vsevik, 2014/06/26 14:16:19]

failedEdits === 0

[sergeyv, 2014/06/26 14:38:35]

Done.

+                WebInspector.LiveEditSupport.logSuccess();
+            else
+                WebInspector.LiveEditSupport.logDetailedError(liveEditError, liveEditErrorData, contextScript)
+
+        }
+
         if (this._supportsEnabledBreakpointsWhileEditing())
             return;
         if (this._scriptFileForTarget.size()) {
             this._hasCommittedLiveEdit = true;
             var scriptFiles = this._scriptFileForTarget.values();
+            callbackCount = scriptFiles.length;
             for (var i = 0; i < scriptFiles.length; ++i)
-                scriptFiles[i].commitLiveEdit();
+                scriptFiles[i].commitLiveEdit(liveEditCallback);
             return;
         }
         this._restoreBreakpointsAfterEditing();
     },
 
     _didMergeToVM: function()
     {
         if (this._supportsEnabledBreakpointsWhileEditing())
             return;
         this._updateDivergedInfobar();
@@ skipping 507 matching lines @@
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.ConsoleMessageRemoved, this._consoleMessageRemoved, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.ConsoleMessagesCleared, this._consoleMessagesCleared, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
         WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
     },
 
     __proto__: WebInspector.UISourceCodeFrame.prototype
 }