Index: runtime/observatory/lib/src/service/object.dart |
diff --git a/runtime/observatory/lib/src/service/object.dart b/runtime/observatory/lib/src/service/object.dart |
index 4c42991a45aa3a7d78642d0c6d252d7808af35a2..fa8026c4a2acceb88d5767580e9b112cb23ee54a 100644 |
--- a/runtime/observatory/lib/src/service/object.dart |
+++ b/runtime/observatory/lib/src/service/object.dart |
@@ -1170,6 +1170,7 @@ class Isolate extends ServiceObjectOwner with Coverage { |
case ServiceEvent.kIsolateUpdate: |
case ServiceEvent.kBreakpointResolved: |
+ case ServiceEvent.kDebuggerUpdate: |
// Update occurs as side-effect of caching. |
break; |
@@ -1265,6 +1266,14 @@ class Isolate extends ServiceObjectOwner with Coverage { |
return invokeRpc('setName', {'name': newName}); |
} |
+ Future getDebuggerUpdate() { |
+ return invokeRpc('_getDebuggerUpdate', {}); |
+ } |
+ |
+ Future setExceptionPauseInfo(String exceptions) { |
+ return invokeRpc('_setExceptionPauseInfo', {'exceptions': exceptions}); |
+ } |
+ |
Future<ServiceMap> getStack() { |
return invokeRpc('getStack', {}); |
} |
@@ -1470,6 +1479,7 @@ class ServiceEvent extends ServiceObject { |
static const kGraph = '_Graph'; |
static const kGC = 'GC'; |
static const kInspect = 'Inspect'; |
+ static const kDebuggerUpdate = '_DebuggerUpdate'; |
static const kConnectionClosed = 'ConnectionClosed'; |
ServiceEvent._empty(ServiceObjectOwner owner) : super._empty(owner); |
@@ -1481,11 +1491,12 @@ class ServiceEvent extends ServiceObject { |
@observable String kind; |
@observable Breakpoint breakpoint; |
@observable Frame topFrame; |
- @observable ServiceMap exception; |
+ @observable Instance exception; |
@observable ServiceObject inspectee; |
@observable ByteData data; |
@observable int count; |
@observable String reason; |
+ @observable String exceptions; |
int chunkIndex, chunkCount, nodeCount; |
@observable bool get isPauseEvent { |
@@ -1537,6 +1548,9 @@ class ServiceEvent extends ServiceObject { |
if (map['count'] != null) { |
count = map['count']; |
} |
+ if (map['_exceptions'] != null) { |
+ exceptions = map['_exceptions']; |
+ } |
} |
String toString() { |
@@ -2091,7 +2105,7 @@ class ServiceFunction extends ServiceObject with Coverage { |
@observable bool isDart; |
@observable ProfileFunction profile; |
- bool get canCache => true; |
+ bool get canCache => !_id.startsWith(ServiceMap.objectIdRingPrefix); |
bool get immutable => false; |
ServiceFunction._empty(ServiceObject owner) : super._empty(owner); |
@@ -2344,7 +2358,8 @@ class Script extends ServiceObject with Coverage { |
@observable int lineOffset; |
@observable int columnOffset; |
@observable Library library; |
- bool get canCache => true; |
+ |
+ bool get canCache => !_id.startsWith(ServiceMap.objectIdRingPrefix); |
Cutch
2015/06/12 13:10:47
A better way to fix handle this:
Whenever an "id"
rmacnak
2015/06/15 17:53:51
Done.
|
bool get immutable => true; |
String _shortUri; |
@@ -3254,6 +3269,8 @@ class Frame extends ServiceObject { |
this.code = map['code']; |
this.variables = map['vars']; |
} |
+ |
+ String toString() => "Frame(${function.qualifiedName})"; |
} |