Switch to using SourceLocation universally in service protocol.

runtime/observatory/lib/src/elements/script_inset.dart

 // Copyright (c) 2013, 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.
 
 library script_inset_element;
 
 import 'dart:async';
 import 'dart:html';
 import 'observatory_element.dart';
 import 'service_ref.dart';
@@ skipping 144 matching lines @@
         }
       }
       return details;
     });
   }
 }
 
 abstract class DeclarationAnnotation extends Annotation {
   DeclarationAnnotation(decl) {
     assert(decl.loaded);
-    var script = decl.script;
-    line = script.tokenToLine(decl.tokenPos);
-    columnStart = script.tokenToCol(decl.tokenPos);
+    SourceLocation location = decl.location;
+    if (location == null) {
+      line = 0;
+      columnStart = 0;
+      columnStop = 0;
+      return;
+    }
+    Script script = location.script;
+    line = script.tokenToLine(location.tokenPos);
+    columnStart = script.tokenToCol(location.tokenPos);
     if ((line == null) || (columnStart == null)) {
       line = 0;
       columnStart = 0;
       columnStop = 0;
     } else {
       columnStart--; // 1-origin -> 0-origin.
 
       // The method's token position is at the beginning of the method
       // declaration, which may be a return type annotation, metadata, static
       // modifier, etc. Try to scan forward to position this annotation on the
@@ skipping 124 matching lines @@
       }
       return details;
     });
   }
 }
 
 /// Box with script source code in it.
 @CustomTag('script-inset')
 class ScriptInsetElement extends ObservatoryElement {
   @published Script script;
+  @published int startPos;
+  @published int endPos;
 
   /// Set the height to make the script inset scroll.  Otherwise it
   /// will show from startPos to endPos.
   @published String height = null;
 
   @published int currentPos;
-  @published int startPos;
-  @published int endPos;
   @published bool inDebuggerContext = false;
   @published ObservableList variables;
 
   int _currentLine;
   int _currentCol;
   int _startLine;
   int _endLine;
 
   var annotations = [];
   var annotationsCursor;
@@ skipping 154 matching lines @@
           for (var field in cls.fields) {
             field.load();
           }
         });
       }
     });
   }
 
   void addClassAnnotations() {
     for (var cls in script.library.classes) {
-      if (cls.script == script) {
+      if ((cls.location != null) && (cls.location.script == script)) {
         annotations.add(new ClassDeclarationAnnotation(cls));
       }
     }
   }
 
   void addFieldAnnotations() {
     for (var field in script.library.variables) {
-      if (field.script == script) {
+      if ((field.location != null) && (field.location.script == script)) {
         annotations.add(new FieldDeclarationAnnotation(field));
       }
     }
     for (var cls in script.library.classes) {
       for (var field in cls.fields) {
-        if (field.script == script) {
+        if ((field.location != null) && (field.location.script == script)) {
           annotations.add(new FieldDeclarationAnnotation(field));
         }
       }
     }
   }
 
   void addFunctionAnnotations() {
     for (var func in script.library.functions) {
-      if (func.script == script) {
+      if ((func.location != null) && (func.location.script == script)) {
         annotations.add(new FunctionDeclarationAnnotation(func));
       }
     }
     for (var cls in script.library.classes) {
       for (var func in cls.functions) {
-        if (func.script == script) {
+        if ((func.location != null) && (func.location.script == script)) {
           annotations.add(new FunctionDeclarationAnnotation(func));
         }
       }
     }
   }
 
   void addCallSiteAnnotations() {
     for (var callSite in script.callSites) {
       annotations.add(new CallSiteAnnotation(callSite));
     }
   }
 
   void addLocalVariableAnnotations() {
     // We have local variable information.
     if (variables != null) {
       // For each variable.
       for (var variable in variables) {
         // Find variable usage locations.
         var locations = script.scanForLocalVariableLocations(
-              variable['name'], variable['tokenPos'], variable['endTokenPos']);
+              variable['name'],
+              variable['_tokenPos'],
+              variable['_endTokenPos']);
 
         // Annotate locations.
         for (var location in locations) {
           annotations.add(new LocalVariableAnnotation(location,
                                                       variable['value']));
         }
       }
     }
   }
 
@@ skipping 186 matching lines @@
     e.append(span('\n'));
 
     return e;
   }
 
   ScriptInsetElement.created()
       : super.created() {
     _updateTask = new Task(update);
   }
 }
+
+@CustomTag('source-inset')
+class SourceInsetElement extends PolymerElement {
+  SourceInsetElement.created() : super.created();
+
+  @published SourceLocation location;
+  @published String height = null;
+  @published int currentPos;
+  @published bool inDebuggerContext = false;
+  @published ObservableList variables;
+}
+