Make BuildSourceClosuresTask explicitly dependent on LIBRARY_ELEMENT2.

pkg/analyzer/lib/src/task/dart.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.
 
 library analyzer.src.task.dart;
 
 import 'dart:collection';
 import 'dart:math' as math;
 
 import 'package:analyzer/src/context/cache.dart';
@@ skipping 1557 matching lines @@
   }
 
   /**
    * Return a map from the names of the inputs of this kind of task to the task
    * input descriptors describing those inputs for a task with the
    * given library [libSource].
    */
   static Map<String, TaskInput> buildInputs(AnalysisTarget target) {
     Source source = target;
     return <String, TaskInput>{
-      IMPORT_INPUT: new _ImportSourceClosureTaskInput(source),
-      EXPORT_INPUT: new _ExportSourceClosureTaskInput(source),
-      IMPORT_EXPORT_INPUT: new _ImportExportSourceClosureTaskInput(source)
+      IMPORT_INPUT: new _ImportSourceClosureTaskInput(source, LIBRARY_ELEMENT2),
+      EXPORT_INPUT: new _ExportSourceClosureTaskInput(source, LIBRARY_ELEMENT2),
+      IMPORT_EXPORT_INPUT:
+          new _ImportExportSourceClosureTaskInput(source, LIBRARY_ELEMENT2)
     };
   }
 
   /**
    * Create a [BuildSourceClosuresTask] based on the given [target] in
    * the given [context].
    */
   static BuildSourceClosuresTask createTask(
       AnalysisContext context, AnalysisTarget target) {
     return new BuildSourceClosuresTask(context, target);
@@ skipping 2009 matching lines @@
    */
   static VerifyUnitTask createTask(
       AnalysisContext context, AnalysisTarget target) {
     return new VerifyUnitTask(context, target);
   }
 }
 
 /**
  * A [TaskInput] whose value is a list of library sources exported directly
  * or indirectly by the target [Source].
+ *
+ * [resultDescriptor] is the type of result which should be produced for each
+ * target [Source].
  */
 class _ExportSourceClosureTaskInput extends TaskInputImpl<List<Source>> {
   final Source target;
+  final ResultDescriptor resultDescriptor;
 
-  _ExportSourceClosureTaskInput(this.target);
+  _ExportSourceClosureTaskInput(this.target, this.resultDescriptor);
 
   @override
   TaskInputBuilder<List<Source>> createBuilder() =>
-      new _SourceClosureTaskInputBuilder(target, _SourceClosureKind.EXPORT);
+      new _SourceClosureTaskInputBuilder(
+          target, _SourceClosureKind.EXPORT, resultDescriptor);
 }
 
 /**
  * A [TaskInput] whose value is a list of library sources imported or exported,
  * directly or indirectly by the target [Source].
+ *
+ * [resultDescriptor] is the type of result which should be produced for each
+ * target [Source].
  */
 class _ImportExportSourceClosureTaskInput extends TaskInputImpl<List<Source>> {
   final Source target;
+  final ResultDescriptor resultDescriptor;
 
-  _ImportExportSourceClosureTaskInput(this.target);
+  _ImportExportSourceClosureTaskInput(this.target, this.resultDescriptor);
 
   @override
   TaskInputBuilder<List<Source>> createBuilder() =>
       new _SourceClosureTaskInputBuilder(
-          target, _SourceClosureKind.IMPORT_EXPORT);
+          target, _SourceClosureKind.IMPORT_EXPORT, resultDescriptor);
 }
 
 /**
  * A [TaskInput] whose value is a list of library sources imported directly
  * or indirectly by the target [Source].
+ *
+ * [resultDescriptor] is the type of result which should be produced for each
+ * target [Source].
  */
 class _ImportSourceClosureTaskInput extends TaskInputImpl<List<Source>> {
   final Source target;
+  final ResultDescriptor resultDescriptor;
 
-  _ImportSourceClosureTaskInput(this.target);
+  _ImportSourceClosureTaskInput(this.target, this.resultDescriptor);
 
   @override
   TaskInputBuilder<List<Source>> createBuilder() =>
-      new _SourceClosureTaskInputBuilder(target, _SourceClosureKind.IMPORT);
+      new _SourceClosureTaskInputBuilder(
+          target, _SourceClosureKind.IMPORT, resultDescriptor);
 }
 
 /**
  * The kind of the source closure to build.
  */
 enum _SourceClosureKind { IMPORT, EXPORT, IMPORT_EXPORT }
 
 /**
  * A [TaskInputBuilder] to build values for [_ImportSourceClosureTaskInput].
  */
 class _SourceClosureTaskInputBuilder implements TaskInputBuilder<List<Source>> {
   final _SourceClosureKind kind;
   final Set<LibraryElement> _libraries = new HashSet<LibraryElement>();
   final List<Source> _newSources = <Source>[];
 
+  @override
+  final ResultDescriptor currentResult;
+
   Source currentTarget;
 
-  _SourceClosureTaskInputBuilder(Source librarySource, this.kind) {
+  _SourceClosureTaskInputBuilder(
+      Source librarySource, this.kind, this.currentResult) {
     _newSources.add(librarySource);
   }
 
   @override
-  ResultDescriptor get currentResult => LIBRARY_ELEMENT2;
-
-  @override
   void set currentValue(Object value) {
     LibraryElement library = value;
     if (_libraries.add(library)) {
       if (kind == _SourceClosureKind.IMPORT ||
           kind == _SourceClosureKind.IMPORT_EXPORT) {
         for (ImportElement importElement in library.imports) {
           Source importedSource = importElement.importedLibrary.source;
           _newSources.add(importedSource);
         }
       }
@@ skipping 20 matching lines @@
 
   @override
   bool moveNext() {
     if (_newSources.isEmpty) {
       return false;
     }
     currentTarget = _newSources.removeLast();
     return true;
   }
 }