Add a working command line debugger to Observatory.

runtime/observatory/lib/src/service/object.dart

 // Copyright (c) 2014, 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.
 
 part of service;
 
 /// A [ServiceObject] represents a persistent object within the vm.
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
     return o1.name.compareTo(o2.name);
@@ skipping 1003 matching lines @@
     var children = _trieData[_trieDataCursor++];
     // Recursively read child nodes.
     for (var i = 0; i < children; i++) {
       var child = _readTrieNode(codeTable);
       node.children.add(child);
       node.summedChildCount += child.count;
     }
     return node;
   }
 
-  // TODO(turnidge): Make this an ObservableList instead.
-  ServiceMap breakpoints;
+  ObservableList breakpoints = new ObservableList();
 
   void _removeBreakpoint(ServiceMap bpt) {
     var script = bpt['location']['script'];
     var tokenPos = bpt['location']['tokenPos'];
     assert(tokenPos != null);
     if (script.loaded) {
       var line = script.tokenToLine(tokenPos);
       assert(line != null);
       if (script.lines[line - 1] != null) {
         assert(script.lines[line - 1].bpt == bpt);
@@ skipping 15 matching lines @@
       // Load the script and then plop in the breakpoint.
       script.load().then((_) {
           _addBreakpoint(bpt);
       });
     }
   }
 
   void _updateBreakpoints(ServiceMap newBreakpoints) {
     // Remove all of the old breakpoints from the Script lines.
     if (breakpoints != null) {
-      for (var bpt in breakpoints['breakpoints']) {
+      for (var bpt in breakpoints) {
         _removeBreakpoint(bpt);
       }
     }
     // Add all of the new breakpoints to the Script lines.
     for (var bpt in newBreakpoints['breakpoints']) {
       _addBreakpoint(bpt);
     }
-    breakpoints = newBreakpoints;
+    breakpoints.clear();
+    breakpoints.addAll(newBreakpoints['breakpoints']);
+
+    // Sort the breakpoints by breakpointNumber.
+    breakpoints.sort((a, b) => (a['breakpointNumber'] - b['breakpointNumber']));
   }
 
   Future<ServiceObject> _inProgressReloadBpts;
 
   Future reloadBreakpoints() {
     // TODO(turnidge): Can reusing the Future here ever cause us to
     // get stale breakpoints?
     if (_inProgressReloadBpts == null) {
       _inProgressReloadBpts =
           invokeRpc('getBreakpoints', {}).then((newBpts) {
@@ skipping 35 matching lines @@
         if (pauseEvent != null &&
             pauseEvent.breakpoint != null &&
             (pauseEvent.breakpoint['id'] == bpt['id'])) {
           return isolate.reload();
         } else {
           return reloadBreakpoints();
         }
       });
   }
 
+  // TODO(turnidge): If the user invokes pause (or other rpcs) twice,
+  // they could get a race.  Consider returning an "in progress"
+  // future to avoid this.
   Future pause() {
     return invokeRpc('pause', {}).then((result) {
         if (result is DartError) {
           // TODO(turnidge): Handle this more gracefully.
           Logger.root.severe(result.message);
         }
         return isolate.reload();
       });
   }
 
@@ skipping 796 matching lines @@
         }
       }
     }
     return true;
   }
 
   ScriptLine(this.script, this.line, this.text) {
     possibleBpt = !_isTrivialLine(text);
 
     // TODO(turnidge): This is not so efficient.  Consider improving.
-    for (var bpt in this.script.isolate.breakpoints['breakpoints']) {
+    for (var bpt in this.script.isolate.breakpoints) {
       var bptScript = bpt['location']['script'];
       var bptTokenPos = bpt['location']['tokenPos'];
       if (bptScript == this.script &&
           bptScript.tokenToLine(bptTokenPos) == line) {
         this.bpt = bpt;
       }
     }
   }
 }
 
@@ skipping 900 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }