Report errors like IMPORT_OF_NON_LIBRARY with the new analysis driver.

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 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
@@ skipping 98 matching lines @@
 const ResultCachingPolicy<UsedImportedElements> USED_IMPORTED_ELEMENTS_POLICY =
     const SimpleResultCachingPolicy(-1, -1);
 
 /**
  * The [ResultCachingPolicy] for [UsedLocalElements]s.
  */
 const ResultCachingPolicy<UsedLocalElements> USED_LOCAL_ELEMENTS_POLICY =
     const SimpleResultCachingPolicy(-1, -1);
 
 /**
- * The errors produced while resolving a library directives.
+ * The errors produced while building a library directives.

[Brian Wilkerson, 2017/01/12 21:34:07]

"a library directives" -->
    "library directives"
 |  "a library directive"
 |  "a library's directives"

(not sure which you mean)

  *
  * The list will be empty if there were no errors, but will not be `null`.
  *
  * The result is only available for [Source]s representing a library.
  */
 final ListResultDescriptor<AnalysisError> BUILD_DIRECTIVES_ERRORS =
     new ListResultDescriptor<AnalysisError>(
         'BUILD_DIRECTIVES_ERRORS', AnalysisError.NO_ERRORS);
-
 /**
  * The errors produced while building a library element.
  *
  * The list will be empty if there were no errors, but will not be `null`.
  *
  * The result is only available for [Source]s representing a library.
  */
 final ListResultDescriptor<AnalysisError> BUILD_LIBRARY_ERRORS =
     new ListResultDescriptor<AnalysisError>(
         'BUILD_LIBRARY_ERRORS', AnalysisError.NO_ERRORS);
@@ skipping 206 matching lines @@
 ];
 
 /**
  * All [AnalysisError]s results in for [LibrarySpecificUnit]s.
  */
 final List<ListResultDescriptor<AnalysisError>> ERROR_UNIT_RESULTS =
     <ListResultDescriptor<AnalysisError>>[
   HINTS,
   LIBRARY_UNIT_ERRORS,
   LINTS,
+  RESOLVE_DIRECTIVES_ERRORS,
   RESOLVE_TYPE_BOUNDS_ERRORS,
   RESOLVE_TYPE_NAMES_ERRORS,
   RESOLVE_UNIT_ERRORS,
   STRONG_MODE_ERRORS,
   VARIABLE_REFERENCE_ERRORS,
   VERIFY_ERRORS
 ];
 
 /**
  * The sources representing the export closure of a library.
@@ skipping 333 matching lines @@
 /**
  * The list of [ConstantEvaluationTarget]s on which error verification depends.
  *
  * The result is only available for [LibrarySpecificUnit]s.
  */
 final ListResultDescriptor<ConstantEvaluationTarget> REQUIRED_CONSTANTS =
     new ListResultDescriptor<ConstantEvaluationTarget>(
         'REQUIRED_CONSTANTS', const <ConstantEvaluationTarget>[]);
 
 /**
+ * The errors produced while resolving a library directives.

[Brian Wilkerson, 2017/01/12 21:34:07]

Same here.

+ *
+ * The list will be empty if there were no errors, but will not be `null`.
+ *
+ * The result is only available for [Source]s representing a library.
+ */
+final ListResultDescriptor<AnalysisError> RESOLVE_DIRECTIVES_ERRORS =
+    new ListResultDescriptor<AnalysisError>(
+        'RESOLVE_DIRECTIVES_ERRORS', AnalysisError.NO_ERRORS);
+
+/**
  * The errors produced while resolving bounds of type parameters of classes,
  * class and function aliases.
  *
  * The list will be empty if there were no errors, but will not be `null`.
  *
  * The result is only available for [LibrarySpecificUnit]s.
  */
 final ListResultDescriptor<AnalysisError> RESOLVE_TYPE_BOUNDS_ERRORS =
     new ListResultDescriptor<AnalysisError>(
         'RESOLVE_TYPE_BOUNDS_ERRORS', AnalysisError.NO_ERRORS);
@@ skipping 507 matching lines @@
           importLibraryMap,
           importSourceKindMap,
           exportLibraryMap,
           exportSourceKindMap);
       libraryUnit.accept(builder);
       // See the commentary in the computation of the LIBRARY_CYCLE result
       // for details on library cycle invalidation.
       libraryElement.invalidateLibraryCycles();
       errors = builder.errors;
     } else {
-      DirectiveResolver resolver = new DirectiveResolver();
+      DirectiveResolver resolver = new DirectiveResolver(
+          sourceModificationTimeMap, importSourceKindMap, exportSourceKindMap);
       libraryUnit.accept(resolver);
+      errors = resolver.errors;
     }
     //
     // Record outputs.
     //
     outputs[LIBRARY_ELEMENT2] = libraryElement;
     outputs[BUILD_DIRECTIVES_ERRORS] = errors;
   }
 
   /**
    * Return a map from the names of the inputs of this kind of task to the task
@@ skipping 2614 matching lines @@
    */
   static const String LINTS_INPUT = 'LINTS';
 
   /**
    * The name of the [STATIC_VARIABLE_RESOLUTION_ERRORS_IN_UNIT] input.
    */
   static const String STATIC_VARIABLE_RESOLUTION_ERRORS_INPUT =
       'STATIC_VARIABLE_RESOLUTION_ERRORS_INPUT';
 
   /**
+   * The name of the [RESOLVE_DIRECTIVES_ERRORS] input.
+   */
+  static const String RESOLVE_DIRECTIVES_ERRORS_INPUT =
+      'RESOLVE_DIRECTIVES_ERRORS';
+
+  /**
    * The name of the [STRONG_MODE_ERRORS] input.
    */
   static const String STRONG_MODE_ERRORS_INPUT = 'STRONG_MODE_ERRORS';
 
   /**
    * The name of the [RESOLVE_TYPE_NAMES_ERRORS] input.
    */
   static const String RESOLVE_TYPE_NAMES_ERRORS_INPUT =
       'RESOLVE_TYPE_NAMES_ERRORS';
 
@@ skipping 37 matching lines @@
   @override
   void internalPerform() {
     //
     // Prepare inputs.
     //
     List<List<AnalysisError>> errorLists = <List<AnalysisError>>[];
     errorLists.add(getRequiredInput(BUILD_DIRECTIVES_ERRORS_INPUT));
     errorLists.add(getRequiredInput(BUILD_LIBRARY_ERRORS_INPUT));
     errorLists.add(getRequiredInput(HINTS_INPUT));
     errorLists.add(getRequiredInput(LINTS_INPUT));
+    errorLists.add(getRequiredInput(RESOLVE_DIRECTIVES_ERRORS_INPUT));
     errorLists.add(getRequiredInput(RESOLVE_TYPE_NAMES_ERRORS_INPUT));
     errorLists.add(getRequiredInput(RESOLVE_TYPE_NAMES_ERRORS2_INPUT));
     errorLists.add(getRequiredInput(RESOLVE_UNIT_ERRORS_INPUT));
     errorLists.add(getRequiredInput(STATIC_VARIABLE_RESOLUTION_ERRORS_INPUT));
     errorLists.add(getRequiredInput(STRONG_MODE_ERRORS_INPUT));
     errorLists.add(getRequiredInput(VARIABLE_REFERENCE_ERRORS_INPUT));
     errorLists.add(getRequiredInput(VERIFY_ERRORS_INPUT));
     //
     // Record outputs.
     //
     outputs[LIBRARY_UNIT_ERRORS] = AnalysisError.mergeLists(errorLists);
   }
 
   /**
    * 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 [unit].
    */
   static Map<String, TaskInput> buildInputs(AnalysisTarget target) {
     LibrarySpecificUnit unit = target;
     Map<String, TaskInput> inputs = <String, TaskInput>{
       HINTS_INPUT: HINTS.of(unit),
       LINTS_INPUT: LINTS.of(unit),
+      RESOLVE_DIRECTIVES_ERRORS_INPUT: RESOLVE_DIRECTIVES_ERRORS.of(unit),
       RESOLVE_TYPE_NAMES_ERRORS_INPUT: RESOLVE_TYPE_NAMES_ERRORS.of(unit),
       RESOLVE_TYPE_NAMES_ERRORS2_INPUT: RESOLVE_TYPE_BOUNDS_ERRORS.of(unit),
       RESOLVE_UNIT_ERRORS_INPUT: RESOLVE_UNIT_ERRORS.of(unit),
       STATIC_VARIABLE_RESOLUTION_ERRORS_INPUT:
           STATIC_VARIABLE_RESOLUTION_ERRORS_IN_UNIT.of(unit),
       STRONG_MODE_ERRORS_INPUT: STRONG_MODE_ERRORS.of(unit),
       VARIABLE_REFERENCE_ERRORS_INPUT: VARIABLE_REFERENCE_ERRORS.of(unit),
       VERIFY_ERRORS_INPUT: VERIFY_ERRORS.of(unit)
     };
     Source source = unit.source;
@@ skipping 1049 matching lines @@
   /**
    * The name of the input whose value is the defining [LIBRARY_ELEMENT2].
    */
   static const String LIBRARY_INPUT = 'LIBRARY_INPUT';
 
   /**
    * The name of the input for [RESOLVED_UNIT1] of a unit.
    */
   static const String UNIT_INPUT = 'UNIT_INPUT';
 
+  static const String SOURCES_MODIFICATION_TIME_INPUT =
+      'SOURCES_MODIFICATION_TIME_INPUT';
+  static const String IMPORTS_SOURCE_KIND_INPUT = 'IMPORTS_SOURCE_KIND_INPUT';
+  static const String EXPORTS_SOURCE_KIND_INPUT = 'EXPORTS_SOURCE_KIND_INPUT';
+
   /**
    * The task descriptor describing this kind of task.
    */
   static final TaskDescriptor DESCRIPTOR = new TaskDescriptor(
       'ResolveDirectiveElementsTask',
       createTask,
-      buildInputs,
-      <ResultDescriptor>[CREATED_RESOLVED_UNIT2, RESOLVED_UNIT2]);
+      buildInputs, <ResultDescriptor>[
+    CREATED_RESOLVED_UNIT2,
+    RESOLVED_UNIT2,
+    RESOLVE_DIRECTIVES_ERRORS
+  ]);
 
   ResolveDirectiveElementsTask(
       InternalAnalysisContext context, AnalysisTarget target)
       : super(context, target);
 
   @override
   TaskDescriptor get descriptor => DESCRIPTOR;
 
   @override
   void internalPerform() {
     LibrarySpecificUnit targetUnit = target;
     //
     // Prepare inputs.
     //
     CompilationUnit unit = getRequiredInput(UNIT_INPUT);
+    Map<Source, int> sourceModificationTimeMap =
+        getRequiredInput(SOURCES_MODIFICATION_TIME_INPUT);
+    Map<Source, SourceKind> importSourceKindMap =
+        getRequiredInput(IMPORTS_SOURCE_KIND_INPUT);
+    Map<Source, SourceKind> exportSourceKindMap =
+        getRequiredInput(EXPORTS_SOURCE_KIND_INPUT);
     //
     // Resolve directive AST nodes to elements.
     //
+    List<AnalysisError> errors = const <AnalysisError>[];
     if (targetUnit.unit == targetUnit.library) {
-      DirectiveResolver resolver = new DirectiveResolver();
+      DirectiveResolver resolver = new DirectiveResolver(
+          sourceModificationTimeMap, importSourceKindMap, exportSourceKindMap);
       unit.accept(resolver);
+      errors = resolver.errors;
     }
     //
     // Record outputs.
     //
     outputs[CREATED_RESOLVED_UNIT2] = true;
     outputs[RESOLVED_UNIT2] = unit;
+    outputs[RESOLVE_DIRECTIVES_ERRORS] = errors;
   }
 
   /**
    * 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 [target].
    */
   static Map<String, TaskInput> buildInputs(AnalysisTarget target) {
     LibrarySpecificUnit unit = target;
     return <String, TaskInput>{
       LIBRARY_INPUT: LIBRARY_ELEMENT2.of(unit.library),
-      UNIT_INPUT: RESOLVED_UNIT1.of(unit)
+      UNIT_INPUT: RESOLVED_UNIT1.of(unit),
+      SOURCES_MODIFICATION_TIME_INPUT:
+          REFERENCED_SOURCES.of(unit.library).toMapOf(MODIFICATION_TIME),
+      IMPORTS_SOURCE_KIND_INPUT:
+          IMPORTED_LIBRARIES.of(unit.library).toMapOf(SOURCE_KIND),
+      EXPORTS_SOURCE_KIND_INPUT:
+          EXPORTED_LIBRARIES.of(unit.library).toMapOf(SOURCE_KIND)
     };
   }
 
   /**
    * Create a [ResolveDirectiveElementsTask] based on the given [target] in
    * the given [context].
    */
   static ResolveDirectiveElementsTask createTask(
       AnalysisContext context, AnalysisTarget target) {
     return new ResolveDirectiveElementsTask(context, target);
@@ skipping 1429 matching lines @@
 
   @override
   bool moveNext() {
     if (_newSources.isEmpty) {
       return false;
     }
     currentTarget = _newSources.removeLast();
     return true;
   }
 }