Observatory: handle the case where package:foo imports are canonicalized as packages/foo.

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 645 matching lines @@
                                          inspectLink(script.library));
         anno.line = line.line;
         anno.columnStart = match.start + 8;
         anno.columnStop = match.end;
         annotations.add(anno);
       }
     }
   }
 
   Library resolveDependency(String relativeUri) {
+    // This isn't really correct: we need to ask the embedder to do the
+    // uri canonicalization for us, but Observatory isn't in a position
+    // to invoke the library tag handler. Handle the most common cases.
     var targetUri = Uri.parse(script.library.uri).resolve(relativeUri);
     for (Library l in script.isolate.libraries) {
       if (targetUri.toString() == l.uri) {
         return l;
       }
     }
+    if (targetUri.scheme == 'package') {

[floitsch, 2015/11/17 01:42:31]

I guess this will get worse when we have package-maps.

[rmacnak, 2015/11/17 01:53:07]

Yeah. Maybe the flutter embedder could canonicalize package: as package: and
only do the resolution to a file in a loading request like the standalone
embedder, but I don't know if there's some other reason to keep it the current
way.

+      targetUri = "packages/${targetUri.path}";
+      for (Library l in script.isolate.libraries) {
+        if (targetUri.toString() == l.uri) {
+          return l;
+        }
+      }
+    }
+
     Logger.root.info("Could not resolve library dependency: $relativeUri");
     return null;
   }
 
   void addDependencyAnnotations() {
     // TODO(rmacnak): Use a real scanner.
     var patterns = [
       new RegExp("import '(.*)'"),
       new RegExp('import "(.*)"'),
       new RegExp("export '(.*)'"),
@@ skipping 345 matching lines @@
 @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;
 }