Handle relative paths in the output of "pub list-package-dirs".

pkg/analysis_server/lib/src/package_map_provider.dart

 // Copyright (c) 2014, 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 package.map.provider;
 
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io' as io;
 
@@ skipping 72 matching lines @@
     } on io.ProcessException catch (exception, stackTrace) {
       AnalysisEngine.instance.logger.logInformation(
           "Error running pub $PUB_LIST_COMMAND\n${exception}\n${stackTrace}");
     }
     if (result.exitCode != 0) {
       AnalysisEngine.instance.logger.logInformation(
           "pub $PUB_LIST_COMMAND failed: exit code ${result.exitCode}");
       return _error(folder);
     }
     try {
-      return parsePackageMap(result.stdout);
+      return parsePackageMap(result.stdout, folder);
     } catch (exception, stackTrace) {
       AnalysisEngine.instance.logger.logError(
           "Malformed output from pub $PUB_LIST_COMMAND\n${exception}\n${stackTrace}");
     }
 
     return _error(folder);
   }
 
   /**
    * Create a PackageMapInfo object representing an error condition.
    */
   PackageMapInfo _error(Folder folder) {
     // Even if an error occurs, we still need to know the dependencies, so that
     // we'll know when to try running "pub list-package-dirs" again.
     // Unfortunately, "pub list-package-dirs" doesn't tell us dependencies when
     // an error occurs, so just assume there is one dependency, "pubspec.lock".
     List<String> dependencies = <String>[join(folder.path, PUBSPEC_LOCK_NAME)];
     return new PackageMapInfo(null, dependencies.toSet());
   }
 
   /**
-   * Decode the JSON output from pub into a package map.
+   * Decode the JSON output from pub into a package map.  Paths in the
+   * output are considered relative to [folder].
    */
-  PackageMapInfo parsePackageMap(String jsonText) {
+  PackageMapInfo parsePackageMap(String jsonText, Folder folder) {
     // The output of pub looks like this:
     // {
     //   "packages": {
     //     "foo": "path/to/foo",
     //     "bar": ["path/to/bar1", "path/to/bar2"],
     //     "myapp": "path/to/myapp",  // self link is included
     //   },
     //   "input_files": [
     //     "path/to/myapp/pubspec.lock"
     //   ]
     // }
     HashMap<String, List<Folder>> packageMap = new HashMap<String, List<Folder>>();
     HashMap obj = JSON.decode(jsonText);
     HashMap packages = obj['packages'];
     processPaths(String packageName, List paths) {
       List<Folder> folders = <Folder>[];
       for (var path in paths) {
         if (path is String) {
-          Resource resource = resourceProvider.getResource(path);
+          Resource resource = folder.getChild(path);
           if (resource is Folder) {
             folders.add(resource);
           }
         }
       }
       if (folders.isNotEmpty) {
         packageMap[packageName] = folders;
       }
     }
     packages.forEach((key, value) {
       if (value is String) {
         processPaths(key, [value]);
       } else if (value is List) {
         processPaths(key, value);
       }
     });
     Set<String> dependencies = new Set<String>();
     List inputFiles = obj['input_files'];
     if (inputFiles != null) {
       for (var path in inputFiles) {
         if (path is String) {
-          dependencies.add(path);
+          dependencies.add(folder.canonicalizePath(path));
         }
       }
     }
     return new PackageMapInfo(packageMap, dependencies);
   }
 }