[DevTools] Better locations for snippets

third_party/WebKit/Source/devtools/front_end/snippets/ScriptSnippetModel.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:
  *
  *     * 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 207 matching lines @@
         var breakpointLocations = this._removeBreakpoints(uiSourceCode);
         this._releaseSnippetScript(uiSourceCode);
         this._restoreBreakpoints(uiSourceCode, breakpointLocations);
 
         var target = executionContext.target();
         var runtimeModel = target.runtimeModel;
         var evaluationIndex = this._nextEvaluationIndex();
         var mapping = this._mappingForTarget.get(target);
         mapping._setEvaluationIndex(evaluationIndex, uiSourceCode);
         var evaluationUrl = mapping._evaluationSourceURL(uiSourceCode);
-        var expression = uiSourceCode.workingCopy();
-        WebInspector.console.show();
-        runtimeModel.compileScript(expression, "", true, executionContext.id, compileCallback.bind(this));
+        uiSourceCode.requestContent().then(compileSnippet.bind(this));
+
+        /**
+         * @this {WebInspector.ScriptSnippetModel}
+         */
+        function compileSnippet()
+        {
+            var expression = uiSourceCode.workingCopy();
+            WebInspector.console.show();
+            runtimeModel.compileScript(expression, "", true, executionContext.id, compileCallback.bind(this));
+        }
 
         /**
          * @param {!RuntimeAgent.ScriptId=} scriptId
          * @param {?RuntimeAgent.ExceptionDetails=} exceptionDetails
          * @this {WebInspector.ScriptSnippetModel}
          */
         function compileCallback(scriptId, exceptionDetails)
         {
             var mapping = this._mappingForTarget.get(target);
             if (mapping.evaluationIndex(uiSourceCode) !== evaluationIndex)
                 return;
 
+            mapping._addScript(executionContext.debuggerModel.scriptForId(scriptId || exceptionDetails.scriptId), uiSourceCode);
             if (!scriptId) {
                 this._printRunOrCompileScriptResultFailure(target, exceptionDetails, evaluationUrl);
                 return;
             }
 
-            mapping._addScript(executionContext.debuggerModel.scriptForId(scriptId), uiSourceCode);
             var breakpointLocations = this._removeBreakpoints(uiSourceCode);
             this._restoreBreakpoints(uiSourceCode, breakpointLocations);
 
             this._runScript(scriptId, executionContext, evaluationUrl);
         }
     },
 
     /**
      * @param {!RuntimeAgent.ScriptId} scriptId
      * @param {!WebInspector.ExecutionContext} executionContext
      * @param {?string=} sourceURL
      */
     _runScript: function(scriptId, executionContext, sourceURL)
     {
         var target = executionContext.target();
         target.runtimeModel.runScript(scriptId, executionContext.id, "console", false, true, runCallback.bind(this, target));
 
         /**
          * @param {!WebInspector.Target} target
          * @param {?RuntimeAgent.RemoteObject} result
          * @param {?RuntimeAgent.ExceptionDetails=} exceptionDetails
          * @this {WebInspector.ScriptSnippetModel}
          */
         function runCallback(target, result, exceptionDetails)
         {
             if (!exceptionDetails)
-                this._printRunScriptResult(target, result, sourceURL);
+                this._printRunScriptResult(target, result, scriptId, sourceURL);
             else
                 this._printRunOrCompileScriptResultFailure(target, exceptionDetails, sourceURL);
         }
     },
 
     /**
      * @param {!WebInspector.Target} target
      * @param {?RuntimeAgent.RemoteObject} result
+     * @param {!RuntimeAgent.ScriptId} scriptId
      * @param {?string=} sourceURL
      */
-    _printRunScriptResult: function(target, result, sourceURL)
+    _printRunScriptResult: function(target, result, scriptId, sourceURL)
     {
         var consoleMessage = new WebInspector.ConsoleMessage(
             target,
             WebInspector.ConsoleMessage.MessageSource.JS,
             WebInspector.ConsoleMessage.MessageLevel.Log,
             "",
             undefined,
             sourceURL,
             undefined,
             undefined,
             undefined,
             [result],
-            undefined);
+            undefined,
+            undefined,
+            undefined,
+            scriptId);
         target.consoleModel.addMessage(consoleMessage);
     },
 
     /**
      * @param {!WebInspector.Target} target
      * @param {?RuntimeAgent.ExceptionDetails=} exceptionDetails
      * @param {?string=} sourceURL
      */
     _printRunOrCompileScriptResultFailure: function(target, exceptionDetails, sourceURL)
     {
         var consoleMessage = new WebInspector.ConsoleMessage(
             target,
             exceptionDetails.source,
             WebInspector.ConsoleMessage.MessageLevel.Error,
             exceptionDetails.text,
             undefined,
             sourceURL,
             exceptionDetails.lineNumber,
             exceptionDetails.columnNumber,
             undefined,
             undefined,
-            exceptionDetails.stackTrace);
+            exceptionDetails.stackTrace,
+            undefined,
+            undefined,
+            exceptionDetails.stackTrace ? undefined : exceptionDetails.scriptId);
         target.consoleModel.addMessage(consoleMessage);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {!Array.<!{breakpoint: !WebInspector.BreakpointManager.Breakpoint, uiLocation: !WebInspector.UILocation}>}
      */
     _removeBreakpoints: function(uiSourceCode)
     {
         var breakpointLocations = WebInspector.breakpointManager.breakpointLocationsForUISourceCode(uiSourceCode);
@@ skipping 336 matching lines @@
         this._model.deleteScriptSnippet(url);
     },
 
     __proto__: WebInspector.ContentProviderBasedProject.prototype
 }
 
 /**
  * @type {!WebInspector.ScriptSnippetModel}
  */
 WebInspector.scriptSnippetModel = new WebInspector.ScriptSnippetModel(WebInspector.workspace);