Fix task dependency graph computation.

pkg/analyzer/tool/task_dependency_graph.dart

Index: pkg/analyzer/tool/task_dependency_graph.dart
diff --git a/pkg/analyzer/tool/task_dependency_graph.dart b/pkg/analyzer/tool/task_dependency_graph.dart
index 79e6d504f7a206965049f550016a60a040297ad8..4625b42a687cdb07848f8d41f261e42fbf27c268 100644
--- a/pkg/analyzer/tool/task_dependency_graph.dart
+++ b/pkg/analyzer/tool/task_dependency_graph.dart
@@ -83,9 +83,9 @@ class Driver {
     context = AnalysisEngine.instance.createAnalysisContext();
     JavaFile packagesDir = new JavaFile(path.join(rootDir, 'packages'));
     List<UriResolver> uriResolvers = [
-      new FileUriResolver(),
       new DartUriResolver(sdk),
-      new PackageUriResolver(<JavaFile>[packagesDir])
+      new PackageUriResolver(<JavaFile>[packagesDir]),
+      new FileUriResolver()
     ];
     context.sourceFactory = new SourceFactory(uriResolvers);
     Source taskSource =
@@ -126,6 +126,10 @@ class Driver {
     String filePath = path.join(rootDir, filename);
     File file = resourceProvider.getResource(filePath);
     Source source = file.createSource();
+    Uri restoredUri = context.sourceFactory.restoreUri(source);
+    if (restoredUri != null) {
+      source = file.createSource(restoredUri);
+    }
     ChangeSet changeSet = new ChangeSet();
     changeSet.addedSource(source);
     context.applyChanges(changeSet);