Make Dart_ScriptGetTokenInfo account for line_offset() and col_offset()

runtime/vm/debugger_api_impl.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 "include/dart_debugger_api.h"
 
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
@@ skipping 672 matching lines @@
                          CURRENT_FUNC, script_url.ToCString(),
                          String::Handle(lib.url()).ToCString());
   }
 
   const GrowableObjectArray& info =
       GrowableObjectArray::Handle(GrowableObjectArray::New());
   const String& source = String::Handle(script.Source());
   const String& key = Symbols::Empty();
   const Object& line_separator = Object::Handle();
   const TokenStream& tkns = TokenStream::Handle(script.tokens());
+  int line_offset = script.line_offset();
   ASSERT(!tkns.IsNull());
   TokenStream::Iterator tkit(tkns, 0);
   int current_line = -1;
   Scanner s(source, key);
   s.Scan();
   while (s.current_token().kind != Token::kEOS) {
     ASSERT(tkit.IsValid());
     ASSERT(s.current_token().kind == tkit.CurrentTokenKind());
     int token_line = s.current_token().position.line;
     if (token_line != current_line) {
       // emit line
       info.Add(line_separator);
-      info.Add(Smi::Handle(Smi::New(token_line)));
+      info.Add(Smi::Handle(Smi::New(token_line + line_offset)));
       current_line = token_line;
     }
     // TODO(hausner): Could optimize here by not reporting tokens
     // that will never be a location used by the debugger, e.g.
     // braces, semicolons, most keywords etc.
     info.Add(Smi::Handle(Smi::New(tkit.CurrentPosition())));
-    info.Add(Smi::Handle(Smi::New(s.current_token().offset)));
+    int column = s.current_token().position.column;
+    // On the first line of the script we must add the column offset.
+    if (token_line == 1) {
+      column += script.col_offset();
+    }
+    info.Add(Smi::Handle(Smi::New(column)));
     s.Scan();
     tkit.Advance();
   }
   return Api::NewHandle(isolate, Array::MakeArray(info));
 }
 
 
 DART_EXPORT Dart_Handle Dart_GenerateScriptSource(Dart_Handle library_url_in,
                                                   Dart_Handle script_url_in) {
   Isolate* isolate = Isolate::Current();
@@ skipping 168 matching lines @@
 
 
 DART_EXPORT char* Dart_GetVmStatus(const char* request) {
   if (strncmp(request, "/isolate/", 9) == 0) {
     return Isolate::GetStatus(request);
   }
   return NULL;
 }
 
 }  // namespace dart