More clean-up in server

pkg/analyzer/lib/src/context/builder.dart

Index: pkg/analyzer/lib/src/context/builder.dart
diff --git a/pkg/analyzer/lib/src/context/builder.dart b/pkg/analyzer/lib/src/context/builder.dart
index b1f2f971531c8d07a248b33d0ea7a8e0657cdcd5..c6e4920bca6340a118b08b7a6dfdd186d97b1dc6 100644
--- a/pkg/analyzer/lib/src/context/builder.dart
+++ b/pkg/analyzer/lib/src/context/builder.dart
@@ -136,14 +136,13 @@ class ContextBuilder {
   }
 
   Map<String, List<Folder>> convertPackagesToMap(Packages packages) {
-    if (packages == null || packages == Packages.noPackages) {
-      return null;
-    }
     Map<String, List<Folder>> folderMap = new HashMap<String, List<Folder>>();
-    packages.asMap().forEach((String packagePath, Uri uri) {
-      String path = resourceProvider.pathContext.fromUri(uri);
-      folderMap[packagePath] = [resourceProvider.getFolder(path)];
-    });
+    if (packages != null && packages != Packages.noPackages) {
+      packages.asMap().forEach((String packagePath, Uri uri) {

[scheglov, 2016/09/20 15:29:14]

Packages.map() says that it "Returns a map from package name to a base URI.".
So, maybe it should be (String name, Uri uri).

[Brian Wilkerson, 2016/09/20 15:39:16]

Done

+        String path = resourceProvider.pathContext.fromUri(uri);
+        folderMap[packagePath] = [resourceProvider.getFolder(path)];
+      });
+    }
     return folderMap;
   }
 
@@ -222,16 +221,11 @@ class ContextBuilder {
     }
     Packages packages = createPackageMap(rootDirectoryPath);
     Map<String, List<Folder>> packageMap = convertPackagesToMap(packages);
-    List<UriResolver> resolvers = <UriResolver>[];
-    resolvers.add(new DartUriResolver(findSdk(packageMap, options)));
-    if (packageMap != null) {
-      // TODO(brianwilkerson) I think that we don't need a PackageUriResolver
-      // when we can pass the packages object to the source factory directly.
-      // Actually, I think we're using it to restoreUri, which could lead to
-      // inconsistencies.
-      resolvers.add(new PackageMapUriResolver(resourceProvider, packageMap));
-    }
-    resolvers.add(fileResolver);
+    List<UriResolver> resolvers = <UriResolver>[
+      new DartUriResolver(findSdk(packageMap, options)),
+      new PackageMapUriResolver(resourceProvider, packageMap),
+      fileResolver
+    ];
     return new SourceFactory(resolvers, packages, resourceProvider);
   }