Fix task dependency graph computation.

pkg/analyzer/tool/task_dependency_graph.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.
 
 /**
  * This file contains code to output a description of tasks and their
  * dependencies in ".dot" format.  Prior to running, the user should run "pub
  * get" in the analyzer directory to ensure that a "packages" folder exists.
  *
  * The ".dot" file is output to standard out.  To convert it to a pdf, store it
@@ skipping 65 matching lines @@
   CompilationUnit getUnit(Source source) =>
       context.resolveCompilationUnit2(source, source);
 
   void run() {
     rootDir = findRoot(Platform.script.toFilePath(windows: Platform.isWindows));
     resourceProvider = PhysicalResourceProvider.INSTANCE;
     DartSdk sdk = DirectoryBasedDartSdk.defaultSdk;
     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 =
         setupSource(path.join('lib', 'src', 'task', 'dart.dart'));
     Source modelSource = setupSource(path.join('lib', 'task', 'model.dart'));
     CompilationUnitElement modelElement = getUnit(modelSource).element;
     InterfaceType analysisTaskType = modelElement.getType('AnalysisTask').type;
     DartType dynamicType = context.typeProvider.dynamicType;
     resultDescriptorType = modelElement.getType('ResultDescriptor').type
         .substitute4([dynamicType]);
@@ skipping 20 matching lines @@
     for (String result in results) {
       print('  $result [shape=box]');
     }
     print('}');
   }
 
   Source setupSource(String filename) {
     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);
     return source;
   }
 }
 
 class ResultDescriptorFinder extends GeneralizingAstVisitor {
   final InterfaceType resultDescriptorType;
   final ResultDescriptorFinderCallback callback;
 
   ResultDescriptorFinder(this.resultDescriptorType, this.callback);
 
   @override
   visitIdentifier(Identifier node) {
     Element element = node.staticElement;
     if (element is PropertyAccessorElement &&
         element.isGetter &&
         element.returnType.isSubtypeOf(resultDescriptorType)) {
       callback(element);
     }
   }
 }