Add local variable declaration token position to service protocol

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 3309 matching lines @@
   static bool _isInitialIdentifierChar(int c) {
     if (c >= 65 && c <= 90) return true; // Upper
     if (c >= 97 && c <= 122) return true; // Lower
     if (c == 95) return true; // Underscore
     if (c == 36) return true; // Dollar
     return false;
   }
 
   static bool _isIdentifierChar(int c) {
     if (_isInitialIdentifierChar(c)) return true;
-    return c >= 48 && c <= 75; // Digit
+    return c >= 48 && c <= 57; // Digit
   }
 
   void _update(Map map, bool mapIsRef) {
     _upgradeCollection(map, isolate);
     super._update(map, mapIsRef);
 
     uri = map['uri'];
     kind = map['_kind'];
     _shortUri = uri.substring(uri.lastIndexOf('/') + 1);
     name = _shortUri;
@@ skipping 60 matching lines @@
     for (var i = 0; i < sourceLines.length; i++) {
       lines.add(new ScriptLine(this, i + lineOffset + 1, sourceLines[i]));
     }
     for (var bpt in isolate.breakpoints.values) {
       if (bpt.location.script == this) {
         _addBreakpoint(bpt);
       }
     }
   }
 
+  // Note, this may return source beyond the token length if [guessTokenLength]
+  // fails.
+  String getToken(int tokenPos) {
+    final int line = tokenToLine(tokenPos);
+    int column = tokenToCol(tokenPos);
+    if ((line == null) || (column == null)) {
+      return null;
+    }
+    // Line and column numbers are

[rmacnak, 2016/10/14 23:10:38]

...are 1-origin in the VM.

[Cutch, 2016/10/17 18:17:27]

Done.

+    column -= 1;
+    String sourceLine = getLine(line).text;
+    if (sourceLine == null) {
+      return null;
+    }
+    final int length = guessTokenLength(line, column);
+    if (length == null) {
+      return sourceLine.substring(column);
+    } else {
+      return sourceLine.substring(column, column + length);
+    }
+  }
+
   void _addBreakpoint(Breakpoint bpt) {
     var line;
     if (bpt.location.tokenPos != null) {
       line = tokenToLine(bpt.location.tokenPos);
     } else {
       UnresolvedSourceLocation loc = bpt.location;
       line = loc.line;
     }
     getLine(line).addBreakpoint(bpt);
   }
@@ skipping 182 matching lines @@
       descriptors
           .add(new PcDescriptor(pcOffset, deoptId, tokenPos, tryIndex, kind));
     }
   }
 }
 
 class LocalVarDescriptor implements M.LocalVarDescriptorsRef {
   final String id;
   final String name;
   final int index;
+  final int declarationPos;
   final int beginPos;
   final int endPos;
   final int scopeId;
   final String kind;
 
-  LocalVarDescriptor(this.id, this.name, this.index, this.beginPos, this.endPos,
-      this.scopeId, this.kind);
+  LocalVarDescriptor(this.id,
+                     this.name,
+                     this.index,
+                     this.declarationPos,
+                     this.beginPos,
+                     this.endPos,
+                     this.scopeId,
+                     this.kind);
 }
 
 class LocalVarDescriptors extends ServiceObject {
   Class clazz;
   int size;
   bool get immutable => true;
   final List<LocalVarDescriptor> descriptors = <LocalVarDescriptor>[];
   LocalVarDescriptors._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   void _update(Map m, bool mapIsRef) {
     if (mapIsRef) {
       return;
     }
     _upgradeCollection(m, isolate);
     clazz = m['class'];
     size = m['size'];
     descriptors.clear();
     for (var descriptor in m['members']) {
       var id = descriptor['name'];
       var name = descriptor['name'];
       var index = descriptor['index'];
-      var beginPos = descriptor['beginPos'];
-      var endPos = descriptor['endPos'];
+      var declarationPos = descriptor['declarationTokenPos'];
+      var beginPos = descriptor['visibleStartTokenPos'];

[rmacnak, 2016/10/14 23:10:38]

Consider scopeStart/EndTokenPos

[Cutch, 2016/10/17 18:17:27]

Done.

+      var endPos = descriptor['visibleEndTokenPos'];
       var scopeId = descriptor['scopeId'];
       var kind = descriptor['kind'].trim();
       descriptors.add(new LocalVarDescriptor(
-          id, name, index, beginPos, endPos, scopeId, kind));
+          id, name, index, declarationPos, beginPos, endPos, scopeId, kind));
     }
   }
 }
 
 class ObjectPool extends HeapObject implements M.ObjectPool {
   bool get immutable => false;
 
   int length;
   List<ObjectPoolEntry> entries;
 
@@ skipping 707 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);
     }
   }
 }