Add closure object type to debugger wire protocol

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 209 matching lines @@
     } else if (Dart_IsError(text)) {
       buf->Printf("#ERROR");
     } else {
       FormatEncodedCharsTrunc(buf, text, max_chars);
     }
   }
 }
 
 
 static void FormatValue(dart::TextBuffer* buf, Dart_Handle object) {
+  bool print_text_field = true;
   if (Dart_IsNumber(object)) {
-    buf->Printf("\"kind\":\"number\",");
+    buf->Printf("\"kind\":\"number\"");
   } else if (Dart_IsString(object)) {
-    buf->Printf("\"kind\":\"string\",");
+    buf->Printf("\"kind\":\"string\"");
   } else if (Dart_IsBoolean(object)) {
-    buf->Printf("\"kind\":\"boolean\",");
+    buf->Printf("\"kind\":\"boolean\"");
   } else if (Dart_IsList(object)) {
     intptr_t len = 0;
     Dart_Handle res = Dart_ListLength(object, &len);
     ASSERT_NOT_ERROR(res);
-    buf->Printf("\"kind\":\"list\",\"length\":%" Pd ",", len);
+    buf->Printf("\"kind\":\"list\",\"length\":%" Pd "", len);
+  } else if (Dart_IsClosure(object)) {
+    Dart_Handle name, signature;
+    Dart_CodeLocation location;
+    Dart_Handle res = Dart_GetClosureInfo(object, &name, &signature, &location);
+    ASSERT_NOT_ERROR(res);
+    buf->Printf("\"kind\":\"function\",\"name\":\"%s\"", GetStringChars(name));
+    buf->Printf(",\"signature\":\"%s\"", GetStringChars(signature));
+    if (!Dart_IsNull(location.script_url)) {
+      ASSERT(Dart_IsString(location.script_url));
+      buf->Printf(",\"location\": { \"url\":");
+      FormatEncodedString(buf, location.script_url);
+      buf->Printf(",\"libraryId\":%d,", location.library_id);
+      buf->Printf("\"tokenOffset\":%d}", location.token_pos);
+    }
+    print_text_field = false;
   } else {
-    buf->Printf("\"kind\":\"object\",");
+    buf->Printf("\"kind\":\"object\"");
     intptr_t class_id = 0;
     Dart_Handle res = Dart_GetObjClassId(object, &class_id);
     if (!Dart_IsError(res)) {
-      buf->Printf("\"classId\":%" Pd ",", class_id);
+      buf->Printf(",\"classId\":%" Pd ",", class_id);
     }
   }
-  buf->Printf("\"text\":\"");
-  const intptr_t max_chars = 250;
-  FormatTextualValue(buf, object, max_chars, true);
-  buf->Printf("\"");
+  if (print_text_field) {
+    buf->Printf(",\"text\":\"");
+    const intptr_t max_chars = 250;
+    FormatTextualValue(buf, object, max_chars, true);
+    buf->Printf("\"");
+  }
 }
 
 
 static void FormatValueObj(dart::TextBuffer* buf, Dart_Handle object) {
   buf->Printf("{");
   FormatValue(buf, object);
   buf->Printf("}");
 }
 
 
@@ skipping 1043 matching lines @@
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }
 
 }  // namespace bin
 }  // namespace dart