More clean-up in server

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

 // Copyright (c) 2016, 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 analyzer.src.context.context_builder;
 
 import 'dart:collection';
 import 'dart:core';
 
 import 'package:analyzer/context/declared_variables.dart';
@@ skipping 118 matching lines @@
     context.contentCache = contentCache;
     context.sourceFactory = createSourceFactory(path, options);
     context.analysisOptions = options;
     context.name = path;
     //_processAnalysisOptions(context, optionMap);
     declareVariables(context);
     return context;
   }
 
   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>>();
+    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)];
+      });
     }
-    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)];
-    });
     return folderMap;
   }
 
 //  void _processAnalysisOptions(
 //      AnalysisContext context, Map<String, YamlNode> optionMap) {
 //    List<OptionsProcessor> optionsProcessors =
 //        AnalysisEngine.instance.optionsPlugin.optionsProcessors;
 //    try {
 //      optionsProcessors.forEach(
 //          (OptionsProcessor p) => p.optionsProcessed(context, optionMap));
@@ skipping 58 matching lines @@
         List<UriResolver> resolvers = <UriResolver>[
           new DartUriResolver(findSdk(null, options)),
           packageResolver,
           fileResolver
         ];
         return new SourceFactory(resolvers, null, resourceProvider);
       }
     }
     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);
   }
 
   /**
    * Add any [declaredVariables] to the list of declared variables used by the
    * given [context].
    */
   void declareVariables(InternalAnalysisContext context) {
     if (declaredVariables != null && declaredVariables.isNotEmpty) {
       DeclaredVariables contextVariables = context.declaredVariables;
@@ skipping 325 matching lines @@
   String _readEmbedderYaml(Folder libDir) {
     File file = libDir.getChild(EMBEDDER_FILE_NAME);
     try {
       return file.readAsStringSync();
     } on FileSystemException {
       // File can't be read.
       return null;
     }
   }
 }