Add text location in debugger event

runtime/bin/dbg_message.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 371 matching lines @@
     if (i > index) {
       buf->Printf(",");
     }
     FormatValueObj(buf, value);
   }
   buf->Printf("]}");
   return NULL;
 }
 
 
+static void FormatLocationFromTrace(dart::TextBuffer* msg,
+                                    Dart_StackTrace trace) {
+  intptr_t trace_len = 0;
+  Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
+  ASSERT_NOT_ERROR(res);
+  Dart_ActivationFrame frame;
+  res = Dart_GetActivationFrame(trace, 0, &frame);
+  ASSERT_NOT_ERROR(res);
+  Dart_Handle script_url;
+  intptr_t token_number = 0;
+  intptr_t line_number = 0;
+  res = Dart_ActivationFrameInfo(frame, NULL, NULL, &line_number, NULL);
+  ASSERT_NOT_ERROR(res);
+  res = Dart_ActivationFrameGetLocation(frame, &script_url, &token_number);
+  ASSERT_NOT_ERROR(res);
+  if (!Dart_IsNull(script_url)) {
+    ASSERT(Dart_IsString(script_url));
+    msg->Printf("\"location\": { \"url\":");
+    FormatEncodedString(msg, script_url);
+    msg->Printf(",\"tokenOffset\":%"Pd",", token_number);
+    msg->Printf("\"lineNumber\":%"Pd"},", line_number);
+  }
+}
+
+
 static void FormatCallFrames(dart::TextBuffer* msg, Dart_StackTrace trace) {
   intptr_t trace_len = 0;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   ASSERT_NOT_ERROR(res);
   msg->Printf("\"callFrames\" : [ ");
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
     ASSERT_NOT_ERROR(res);
     Dart_Handle func_name;
     Dart_Handle script_url;
     intptr_t line_number = 0;
+    intptr_t token_number = 0;
     intptr_t library_id = 0;
     res = Dart_ActivationFrameInfo(
-        frame, &func_name, &script_url, &line_number, &library_id);
+        frame, &func_name, NULL, &line_number, &library_id);
     ASSERT_NOT_ERROR(res);
+
     ASSERT(Dart_IsString(func_name));
     msg->Printf("%s{\"functionName\":", (i > 0) ? "," : "");
     FormatEncodedString(msg, func_name);
     msg->Printf(",\"libraryId\": %"Pd",", library_id);
 
-    ASSERT(Dart_IsString(script_url));
-    msg->Printf("\"location\": { \"url\":");
-    FormatEncodedString(msg, script_url);
-    msg->Printf(",\"lineNumber\":%"Pd"},", line_number);
+    res = Dart_ActivationFrameGetLocation(frame, &script_url, &token_number);
+    ASSERT_NOT_ERROR(res);
+    if (!Dart_IsNull(script_url)) {
+      ASSERT(Dart_IsString(script_url));
+      msg->Printf("\"location\": { \"url\":");
+      FormatEncodedString(msg, script_url);
+      msg->Printf(",\"tokenOffset\":%"Pd",", token_number);
+      msg->Printf("\"lineNumber\":%"Pd"},", line_number);
+    }
 
     Dart_Handle locals = Dart_GetLocalVariables(frame);
     ASSERT_NOT_ERROR(locals);
     msg->Printf("\"locals\":");
     FormatNamedValueList(msg, locals);
     msg->Printf("}");
   }
   msg->Printf("]");
 }
 
@@ skipping 478 matching lines @@
 
 
 void DbgMsgQueue::SendQueuedMsgs() {
   if (queued_output_messages_.length() > 0) {
     DebuggerConnectionHandler::BroadcastMsg(&queued_output_messages_);
     queued_output_messages_.Clear();
   }
 }
 
 
+// TODO(hausner): Remove stack trace parameter once we remove the stack
+// trace from the paused event in the wire protocol.

[Tom Ball, 2013/04/02 16:24:54]

We should be able to remove it now, if the editor checks for a null after
fetching that parameter, like it should for all JSON object fields.

[hausner, 2013/04/02 17:15:23]

True. But i want to make sure the editor/debugger shows a valid stack trace. For
that, it would have to issue a getStackTrace command in addition to the null
check you mention.

I think this will go away very soon, hopefully with the next change when the
editor is updated.

 void DbgMsgQueue::SendBreakpointEvent(Dart_StackTrace trace) {
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": { ");
   msg.Printf("\"reason\": \"breakpoint\", ");
   msg.Printf("\"id\": %"Pd64", ", isolate_id_);
+  FormatLocationFromTrace(&msg, trace);
   FormatCallFrames(&msg, trace);
   msg.Printf("}}");
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
 
 
+// TODO(hausner): Remove stack trace parameter once we remove the stack
+// trace from the paused event in the wire protocol.
 void DbgMsgQueue::SendExceptionEvent(Dart_Handle exception,
                                      Dart_StackTrace stack_trace) {
   intptr_t exception_id = Dart_CacheObject(exception);
   ASSERT(exception_id >= 0);
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": {");
   msg.Printf("\"reason\": \"exception\", ");
   msg.Printf("\"id\": %"Pd64", ", isolate_id_);
   msg.Printf("\"exception\":");
   FormatRemoteObj(&msg, exception);
   msg.Printf(", ");
+  FormatLocationFromTrace(&msg, stack_trace);
   FormatCallFrames(&msg, stack_trace);
   msg.Printf("}}");
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
 
 
+// TODO(hausner): Remove stack trace parameter once we remove the stack
+// trace from the interrupted event in the wire protocol.
 void DbgMsgQueue::SendIsolateEvent(Dart_IsolateId isolate_id,
                                    Dart_IsolateEvent kind) {
   dart::TextBuffer msg(128);
   if (kind == kInterrupted) {
     Dart_StackTrace trace;
     Dart_Handle res = Dart_GetStackTrace(&trace);
     ASSERT_NOT_ERROR(res);
     msg.Printf("{ \"event\": \"paused\", \"params\": { ");
     msg.Printf("\"reason\": \"interrupted\", ");
     msg.Printf("\"id\": %"Pd64", ", isolate_id);
+    FormatLocationFromTrace(&msg, trace);
     FormatCallFrames(&msg, trace);
     msg.Printf("}}");
   } else {
     msg.Printf("{ \"event\": \"isolate\", \"params\": { ");
     if (kind == kCreated) {
       msg.Printf("\"reason\": \"created\", ");
     } else {
       ASSERT(kind == kShutdown);
       msg.Printf("\"reason\": \"shutdown\", ");
     }
@@ skipping 175 matching lines @@
     msg_queue->SendIsolateEvent(isolate_id, kind);
     if (kind == kInterrupted) {
       msg_queue->HandleMessages();
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }