observatory/vm: add support for computing/passing end tokens on classes

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 3234 matching lines @@
   StorePointer(&raw_ptr()->script_, value.raw());
 }
 
 
 void Class::set_token_pos(intptr_t token_pos) const {
   ASSERT(token_pos >= 0);
   raw_ptr()->token_pos_ = token_pos;
 }
 
 
+intptr_t Class::ComputeEndTokenPos() const {
+  // Return the begin token for synthetic classes.
+  if (IsSignatureClass() || IsMixinApplication() || IsTopLevel()) {
+    return token_pos();
+  }
+  const Script& scr = Script::Handle(script());
+  ASSERT(!scr.IsNull());
+  const TokenStream& tkns = TokenStream::Handle(scr.tokens());
+  TokenStream::Iterator tkit(
+      tkns, token_pos(), TokenStream::Iterator::kNoNewlines);
+  intptr_t level = 0;
+  while (tkit.CurrentTokenKind() != Token::kEOS) {
+    if (tkit.CurrentTokenKind() == Token::kLBRACE) {
+      level++;
+    } else if (tkit.CurrentTokenKind() == Token::kRBRACE) {
+      if (--level == 0) {
+        return tkit.CurrentPosition();
+      }
+    }
+    tkit.Advance();
+  }
+  UNREACHABLE();
+  return 0;
+}
+
+
 void Class::set_is_implemented() const {
   set_state_bits(ImplementedBit::update(true, raw_ptr()->state_bits_));
 }
 
 
 void Class::set_is_abstract() const {
   set_state_bits(AbstractBit::update(true, raw_ptr()->state_bits_));
 }
 
 
@@ skipping 736 matching lines @@
   jsobj.AddProperty("const", is_const());
   const Class& superClass = Class::Handle(SuperClass());
   if (!superClass.IsNull()) {
     jsobj.AddProperty("super", superClass);
   }
   jsobj.AddProperty("library", Object::Handle(library()));
   const Script& script = Script::Handle(this->script());
   if (!script.IsNull()) {
     jsobj.AddProperty("script", script);
     jsobj.AddProperty("tokenPos", token_pos());
+    jsobj.AddProperty("endTokenPos", ComputeEndTokenPos());
   }
   {
     JSONArray interfaces_array(&jsobj, "interfaces");
     const Array& interface_array = Array::Handle(interfaces());
     Type& interface_type = Type::Handle();
     Class& interface_cls = Class::Handle();
     if (!interface_array.IsNull()) {
       for (intptr_t i = 0; i < interface_array.Length(); ++i) {
         // TODO(turnidge): Use the Type directly once regis has added
         // types to the vmservice.
@@ skipping 14987 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart