Transmit breakpoint id on paused event

tools/ddbg.dart

 // 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.
 
 // Simple interactive debugger shell that connects to the Dart VM's debugger
 // connection port.
 
 import "dart:convert";
 import "dart:io";
 import "dart:async";
@@ skipping 29 matching lines @@
 Map<int, Completer> outstandingCommands;
 
 Socket vmSock;
 String vmData;
 var cmdSubscription;
 Commando cmdo;
 var vmSubscription;
 int seqNum = 0;
 
 bool isDebugging = false;
-bool stepMode = false;
 Process targetProcess = null;
 bool suppressNextExitCode = false;
 
 final verbose = false;
 final printMessages = false;
 
 TargetIsolate currentIsolate;
 TargetIsolate mainIsolate;
 
 int debugPort = 5858;
@@ skipping 443 matching lines @@
 typedef void HandlerType(Map response);
 
 HandlerType showPromptAfter(void handler(Map response)) {
   return (response) {
     handler(response);
     cmdo.show();
   };
 }
 
 void processCommand(String cmdLine) {
-  
   void huh() {
     print("'$cmdLine' not understood, try 'help' for help.");
   }
 
   cmdo.hide();
   seqNum++;
   cmdLine = cmdLine.trim();
   var args = cmdLine.split(' ');
   if (args.length == 0) {
     return;
   }
   var command = args[0];
 
   var resume_commands =
       { 'r':'resume', 's':'stepOver', 'si':'stepInto', 'so':'stepOut'};
   if (resume_commands[command] != null) {
     if (!checkPaused()) return;
-    // TODO(turnidge): step mode isn't quite right yet.
-    stepMode = (command != 'r');
     var cmd = { "id": seqNum,
                 "command": resume_commands[command],
                 "params": { "isolateId" : currentIsolate.id } };
     sendCmd(cmd).then(showPromptAfter(handleResumedResponse));
   } else if (command == "bt") {
     var cmd = { "id": seqNum,
                 "command": "getStackTrace",
                 "params": { "isolateId" : currentIsolate.id } };
     sendCmd(cmd).then(showPromptAfter(handleStackTraceResponse));
   } else if (command == "ll") {
@@ skipping 482 matching lines @@
   var reason = msg["params"]["reason"];
   int isolateId = msg["params"]["isolateId"];
   assert(isolateId != null);
   var isolate = targetIsolates[isolateId];
   assert(isolate != null);
   assert(!isolate.isPaused);
   var location = msg["params"]["location"];;
   assert(location != null);
   isolate.pausedLocation = location;
   if (reason == "breakpoint") {
-    return printLocation((stepMode ? null : "Breakpoint"), location);
+    var bpId = (msg["params"]["breakpointId"]);
+    var label = (bpId != null) ? "Breakpoint $bpId" : null;
+    return printLocation(label, location);
   } else if (reason == "interrupted") {
-    stepMode = false;
     return printLocation("Interrupted", location);
   } else {
     assert(reason == "exception");
     var excObj = msg["params"]["exception"];
     print("Isolate $isolateId paused on exception");
     print(remoteObject(excObj));
     return new Future.value();
   }
 }
 
@@ skipping 84 matching lines @@
 bool haveGarbageVmData() {
   if (vmData == null || vmData.length == 0) return false;
   var i = 0, char = " ";
   while (i < vmData.length) {
     char = vmData[i];
     if (char != " " && char != "\n" && char != "\r" && char != "\t") break;
     i++;
   }
   if (i >= vmData.length) {
     return false;
-  } else { 
+  } else {
     return char != "{";
   }
 }
 
 
 void processVmData(String data) {
   if (vmData == null || vmData.length == 0) {
     vmData = data;
   } else {
     vmData = vmData + data;
@@ skipping 167 matching lines @@
     delay = new Duration(milliseconds:10);
   } else if (attempt < 20) {
     delay = new Duration(seconds:1);
   } else {
     // Too many retries.  Give up.
     //
     // TODO(turnidge): Kill the debugged process here?
     print('Timed out waiting for debugger to start.\nError: $e');
     return closeVmSocket();
   }
-      
   // Wait and retry.
   return new Future.delayed(delay, () {
       openVmSocket(attempt + 1);
     });
 }
 
 
 Future closeVmSocket() {
   if (vmSubscription == null) {
     // Already closed, nothing to do.
@@ skipping 12 matching lines @@
   // This is uglier than it needs to be since cancel can return null.
   var cleanupFutures = [sock.close()];
   var future = subscription.cancel();
   if (future != null) {
     cleanupFutures.add(future);
   }
 
   vmSubscription = null;
   vmSock = null;
   outstandingCommands = null;
-  
   return Future.wait(cleanupFutures);
 }
 
 void debuggerError(self, parent, zone, error, StackTrace trace) {
   print('\n--------\nExiting due to unexpected error:\n'
         '  $error\n$trace\n');
   debuggerQuit();
 }
 
 Future debuggerQuit() {
@@ skipping 34 matching lines @@
       handleUncaughtError: debuggerError));
 
   zone.run(() {
       parseArgs(args);
       cmdo = new Commando(completer: debuggerCommandCompleter);
       cmdSubscription = cmdo.commands.listen(processCommand,
                                              onError: processError,
                                              onDone: processDone);
     });
 }