Revert "Make VM resolvePackageUri fail on package:foo and package:/foo."

runtime/bin/vmservice/loader.dart

 // Copyright (c) 2015, 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.
 
 part of vmservice_io;
 
 _sanitizeWindowsPath(path) {
   // For Windows we need to massage the paths a bit according to
   // http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx
   //
@@ skipping 98 matching lines @@
   // The directory to look in to resolve "package:" scheme URIs. By default it
   // is the 'packages' directory right next to the script.
   Uri _packageRoot = null;
 
   // The map describing how certain package names are mapped to Uris.
   Uri _packageConfig = null;
   Map<String, Uri> _packageMap = null;
 
   _setPackageRoot(String packageRoot) {
     packageRoot = _sanitizeWindowsPath(packageRoot);
+    packageRoot = _enforceTrailingSlash(packageRoot);
     if (packageRoot.startsWith('file:') ||
         packageRoot.startsWith('http:') ||
         packageRoot.startsWith('https:')) {
-      packageRoot = _enforceTrailingSlash(packageRoot);
       _packageRoot = _workingDirectory.resolve(packageRoot);
     } else {
       packageRoot = _sanitizeWindowsPath(packageRoot);
       packageRoot = _trimWindowsPath(packageRoot);
-      _packageRoot =
-          _workingDirectory.resolveUri(new Uri.directory(packageRoot));
+      _packageRoot = _workingDirectory.resolveUri(new Uri.file(packageRoot));
     }
   }
 
   _setPackagesConfig(String packagesParam) {
     var packagesName = _sanitizeWindowsPath(packagesParam);
     var packagesUri = Uri.parse(packagesName);
     if (packagesUri.scheme == '') {
       // Script does not have a scheme, assume that it is a path,
       // resolve it against the working directory.
       packagesUri = _workingDirectory.resolveUri(packagesUri);
@@ skipping 18 matching lines @@
       // Register the action for when the package resolution is ready.
       _pendingPackageLoads.add(action);
     }
   }
 
   // A list of callbacks which should be invoked after the package map has been
   // loaded.
   List<Function> _pendingPackageLoads = [];
 
   // Given a uri with a 'package' scheme, return a Uri that is prefixed with
-  // the package root or resolved relative to the package configuration.
+  // the package root.
   Uri _resolvePackageUri(Uri uri) {
     assert(uri.scheme == "package");
     assert(_packagesReady);
 
-    if (uri.host.isNotEmpty) {
+    if (!uri.host.isEmpty) {
       var path = '${uri.host}${uri.path}';
       var right = 'package:$path';
       var wrong = 'package://$path';
 
       throw "URIs using the 'package:' scheme should look like "
             "'$right', not '$wrong'.";
     }
 
-    var packageNameEnd = uri.path.indexOf('/');
-    if (packageNameEnd == 0) {
-      // Package URIs must have a non-empty package name (not start with "/").
-      throw "URIS using the 'package:' scheme should look like "
-            "'package:packageName${uri.path}', not 'package:${uri.path}'";
-    }
-    if (packageNameEnd < 0) {
-      // Package URIs must have a path after the package name, even if it's
-      // just "/".
-      throw "URIS using the 'package:' scheme should look like "
-            "'package:${uri.path}/', not 'package:${uri.path}'";
-    }
     if (_traceLoading) {
       _log('Resolving package with uri path: ${uri.path}');
     }
     var resolvedUri;
     if (_packageError != null) {
       if (_traceLoading) {
         _log("Resolving package with pending resolution error: $_packageError");
       }
       throw _packageError;
     } else if (_packageRoot != null) {
       resolvedUri = _packageRoot.resolve(uri.path);
     } else {
-      var packageName = uri.path.substring(0, packageNameEnd);
+      var packageName = uri.pathSegments[0];
       var mapping = _packageMap[packageName];
       if (_traceLoading) {
         _log("Mapped '$packageName' package to '$mapping'");
       }
       if (mapping == null) {
         throw "No mapping for '$packageName' package when resolving '$uri'.";
       }
       var path;
-      assert(uri.path.length > packageName.length);
-      path = uri.path.substring(packageName.length + 1);
+      if (uri.path.length > packageName.length) {
+        path = uri.path.substring(packageName.length + 1);
+      } else {
+        // Handle naked package resolution to the default package name:
+        // package:foo is equivalent to package:foo/foo.dart
+        assert(uri.path.length == packageName.length);
+        path = "$packageName.dart";
+      }
       if (_traceLoading) {
         _log("Path to be resolved in package: $path");
       }
       resolvedUri = mapping.resolve(path);
     }
     if (_traceLoading) {
       _log("Resolved '$uri' to '$resolvedUri'.");
     }
     return resolvedUri;
   }
@@ skipping 761 matching lines @@
           }
           resolvedUri = null;
         }
         sp.send(resolvedUri);
       });
     break;
     default:
       _log('Unknown loader request tag=$tag from $isolateId');
   }
 }