Kernel debugging; service tests

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/become.h"
@@ skipping 9206 matching lines @@
       } else {
         min = midpoint;
       }
     }
     *line = min + 1;  // Line numbers start at 1.
     smi ^= line_starts_array.At(min);
     if (column != NULL) {
       *column = offset - smi.Value() + 1;
     }
     if (token_len != NULL) {
-      // We don't explicitly save this data.
-      // TODO(jensj): Load the source and attempt to find it from there.
+      // We don't explicitly save this data: Load the source
+      // and find it from there.
+      const String& source = String::Handle(zone, Source());
+      ASSERT(source.Length() >= offset);
       *token_len = 1;
+      if (Scanner::IsIdentStartChar(source.CharAt(offset))) {
+        for (intptr_t i = offset + 1; i < source.Length(); ++i, ++*token_len) {

[hausner, 2017/03/06 16:58:55]

I find this hard to read, since the for loop more or less does what the loop
body should do, and the body contains half the termination condition.

Assuming that source.CharAt() returns 0 as the last character in the source, the
loop could be rewritten as:

for (intptr_t i = offset + 1; Scanner::IsIdentChar(source.CharAt(i)); ++i) {
  ++*token_len;
}

[jensj, 2017/03/07 08:43:40]

Done.

+          if (!Scanner::IsIdentChar(source.CharAt(i))) {
+            break;
+          }
+        }
+      }
     }
     return;
   }
 
   const TokenStream& tkns = TokenStream::Handle(zone, tokens());
   if (tkns.IsNull()) {
     ASSERT((Dart::vm_snapshot_kind() == Snapshot::kAppAOT));
     *line = -1;
     if (column != NULL) {
       *column = -1;
@@ skipping 13652 matching lines @@
   return UserTag::null();
 }
 
 
 const char* UserTag::ToCString() const {
   const String& tag_label = String::Handle(label());
   return tag_label.ToCString();
 }
 
 }  // namespace dart