Kernel debugging; service tests

runtime/vm/object.cc

Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 7482015638326648d80173606445df517d1fcd6b..17b551828d283cc99f50bd3a48ba13d5c228d39b 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -9224,9 +9224,18 @@ void Script::GetTokenLocation(TokenPosition token_pos,
       *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;
   }