vm-service: Add optional 'scope' parameter to 'evaluate' and 'evaluateInFrame'.

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;
 
 // Some value smaller than the object ring, so requesting a large array
 // doesn't result in an expired ref because the elements lapped it in the
 // object ring.
 const int kDefaultFieldLimit = 100;
@@ skipping 1834 matching lines @@
   }
 
   Future<ObjectStore> getObjectStore() {
     return invokeRpcNoUpgrade('_getObjectStore', {}).then((map) {
       ObjectStore objectStore = new ObjectStore._empty(this);
       objectStore._update(map, false);
       return objectStore;
     });
   }
 
-  Future<ServiceObject> eval(ServiceObject target, String expression) {
+  Future<ServiceObject> eval(ServiceObject target, String expression,
+      {Map<String, ServiceObject> scope}) {
     Map params = {
       'targetId': target.id,
       'expression': expression,
     };
+    if (scope != null) {
+      Map<String, String> scopeWithIds = new Map();
+      scope.forEach((String name, ServiceObject object) {
+        scopeWithIds[name] = object.id;
+      });
+      params["scope"] = scopeWithIds;
+    }
     return invokeRpc('evaluate', params);
   }
 
-  Future<ServiceObject> evalFrame(int frameIndex, String expression) {
+  Future<ServiceObject> evalFrame(int frameIndex, String expression,
+      {Map<String, ServiceObject> scope}) {
     Map params = {
       'frameIndex': frameIndex,
       'expression': expression,
     };
+    if (scope != null) {
+      Map<String, String> scopeWithIds = new Map();
+      scope.forEach((String name, ServiceObject object) {
+        scopeWithIds[name] = object.id;
+      });
+      params["scope"] = scopeWithIds;
+    }
     return invokeRpc('evaluateInFrame', params);
   }
 
   Future<ServiceObject> getReachableSize(ServiceObject target) {
     Map params = {
       'targetId': target.id,
     };
     return invokeRpc('_getReachableSize', params);
   }
 
@@ skipping 493 matching lines @@
     classes.addAll(map['classes']);
     classes.sort(ServiceObject.LexicalSortName);
     variables.clear();
     variables.addAll(map['variables']);
     variables.sort(ServiceObject.LexicalSortName);
     functions.clear();
     functions.addAll(map['functions']);
     functions.sort(ServiceObject.LexicalSortName);
   }
 
-  Future<ServiceObject> evaluate(String expression) {
-    return isolate.eval(this, expression);
+  Future<ServiceObject> evaluate(String expression, {Map scope}) {
+    return isolate.eval(this, expression, scope: scope);
   }
 
   Script get rootScript {
     for (Script script in scripts) {
       if (script.uri == uri) return script;
     }
     return null;
   }
 
   String toString() => "Library($uri)";
@@ skipping 148 matching lines @@
   }
 
   void _addSubclass(Class subclass) {
     if (subclasses.contains(subclass)) {
       return;
     }
     subclasses.add(subclass);
     subclasses.sort(ServiceObject.LexicalSortName);
   }
 
-  Future<ServiceObject> evaluate(String expression) {
-    return isolate.eval(this, expression);
+  Future<ServiceObject> evaluate(String expression, {Map scope}) {
+    return isolate.eval(this, expression, scope: scope);
   }
 
   Future<ServiceObject> setTraceAllocations(bool enable) {
     return isolate.invokeRpc('_setTraceClassAllocation', {
       'enable': enable,
       'classId': id,
     });
   }
 
   Future<ServiceObject> getAllocationSamples([String tags = 'None']) {
@@ skipping 332 matching lines @@
   String get shortName {
     if (isClosure) {
       return closureFunction.qualifiedName;
     }
     if (valueAsString != null) {
       return valueAsString;
     }
     return 'a ${clazz.name}';
   }
 
-  Future<ServiceObject> evaluate(String expression) {
-    return isolate.eval(this, expression);
+  Future<ServiceObject> evaluate(String expression, {Map scope}) {
+    return isolate.eval(this, expression, scope: scope);
   }
 
   String toString() => 'Instance($shortName)';
 }
 
 class Context extends HeapObject implements M.Context {
   Context parentContext;
   int length;
   Iterable<ContextElement> variables;
 
@@ skipping 1711 matching lines @@
     var v = list[i];
     if ((v is Map) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is List) {
       _upgradeList(v, owner);
     } else if (v is Map) {
       _upgradeMap(v, owner);
     }
   }
 }