Version 2.11.0-234.0.dev

Merge commit 'b155af244282a612ff4f5fff4919c904a2922df5' into 'dev'

Author: Dart CI

pkg/analyzer/lib/dart/element/element.dart

@@ -697,8 +697,14 @@ abstract class ElementAnnotation implements ConstantEvaluationTarget {
   @Deprecated('Use computeConstantValue() instead')
   DartObject get constantValue;
 
-  /// Return the element representing the field, variable, or const constructor
-  /// being used as an annotation.
+  /// Return the element referenced by this annotation.
+  ///
+  /// In valid code this element can be a [PropertyAccessorElement] getter
+  /// of a constant top-level variable, or a constant static field of a
+  /// class; or a constant [ConstructorElement].
+  ///
+  /// In invalid code this element can be `null`, or a reference to any
+  /// other element.
   Element get element;
 
   /// Return `true` if this annotation marks the associated function as always

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -174,6 +174,14 @@ class AnalysisDriver implements AnalysisDriverGeneric {
   /// The list of tasks to compute files referencing a name.
   final _referencingNameTasks = <_FilesReferencingNameTask>[];
 
+  /// The mapping from the files for which errors were requested using
+  /// [getErrors] to the [Completer]s to report the result.
+  final _errorsRequestedFiles = <String, List<Completer<ErrorsResult>>>{};
+
+  /// The requests from [_errorsRequestedFiles] for files which were found to
+  /// be parts without known libraries, so delayed.
+  final _errorsRequestedParts = <String, List<Completer<ErrorsResult>>>{};
+
   /// The mapping from the files for which the index was requested using
   /// [getIndex] to the [Completer]s to report the result.
   final _indexRequestedFiles =
@@ -385,6 +393,9 @@ class AnalysisDriver implements AnalysisDriverGeneric {
         _referencingNameTasks.isNotEmpty) {
       return AnalysisDriverPriority.interactive;
     }
+    if (_errorsRequestedFiles.isNotEmpty) {
+      return AnalysisDriverPriority.interactive;
+    }
     if (_indexRequestedFiles.isNotEmpty) {
       return AnalysisDriverPriority.interactive;
     }
@@ -416,7 +427,8 @@ class AnalysisDriver implements AnalysisDriverGeneric {
     if (_fileTracker.hasPendingFiles) {
       return AnalysisDriverPriority.general;
     }
-    if (_requestedParts.isNotEmpty ||
+    if (_errorsRequestedParts.isNotEmpty ||
+        _requestedParts.isNotEmpty ||
         _partsToAnalyze.isNotEmpty ||
         _unitElementSignatureParts.isNotEmpty ||
         _unitElementRequestedParts.isNotEmpty) {
@@ -547,19 +559,12 @@ class AnalysisDriver implements AnalysisDriverGeneric {
       return null;
     }
 
-    // Ask the analysis result without unit, so return cached errors.
-    // If no cached analysis result, it will be computed.
-    ResolvedUnitResult analysisResult = _computeAnalysisResult(path);
-
-    // If not computed yet, because a part file without a known library,
-    // we have to compute the full analysis result, with the unit.
-    analysisResult ??= await getResult(path);
-    if (analysisResult == null) {
-      return null;
-    }
-
-    return ErrorsResultImpl(currentSession, path, analysisResult.uri,
-        analysisResult.lineInfo, analysisResult.isPart, analysisResult.errors);
+    var completer = Completer<ErrorsResult>();
+    _errorsRequestedFiles
+        .putIfAbsent(path, () => <Completer<ErrorsResult>>[])
+        .add(completer);
+    _scheduler.notify(this);
+    return completer.future;
   }
 
   /// Return a [Future] that completes with the list of added files that
@@ -967,6 +972,21 @@ class AnalysisDriver implements AnalysisDriverGeneric {
       return;
     }
 
+    // Process an error request.
+    if (_errorsRequestedFiles.isNotEmpty) {
+      var path = _errorsRequestedFiles.keys.first;
+      var completers = _errorsRequestedFiles.remove(path);
+      var result = _computeErrors(path: path, asIsIfPartWithoutLibrary: false);
+      if (result != null) {
+        completers.forEach((completer) {
+          completer.complete(result);
+        });
+      } else {
+        _errorsRequestedParts.putIfAbsent(path, () => []).addAll(completers);
+      }
+      return;
+    }
+
     // Process an index request.
     if (_indexRequestedFiles.isNotEmpty) {
       String path = _indexRequestedFiles.keys.first;
@@ -1147,6 +1167,17 @@ class AnalysisDriver implements AnalysisDriverGeneric {
       });
       return;
     }
+
+    // Compute errors in a part.
+    if (_errorsRequestedParts.isNotEmpty) {
+      var path = _errorsRequestedParts.keys.first;
+      var completers = _errorsRequestedParts.remove(path);
+      var result = _computeErrors(path: path, asIsIfPartWithoutLibrary: true);
+      completers.forEach((completer) {
+        completer.complete(result);
+      });
+      return;
+    }
   }
 
   /// Remove the file with the given [path] from the list of files to analyze.
@@ -1334,6 +1365,21 @@ class AnalysisDriver implements AnalysisDriverGeneric {
     return Uint8List.fromList(bytes).buffer.asUint32List();
   }
 
+  ErrorsResult _computeErrors({
+    @required String path,
+    @required bool asIsIfPartWithoutLibrary,
+  }) {
+    ResolvedUnitResult analysisResult = _computeAnalysisResult(path,
+        withUnit: false, asIsIfPartWithoutLibrary: asIsIfPartWithoutLibrary);
+
+    if (analysisResult == null) {
+      return null;
+    }
+
+    return ErrorsResultImpl(currentSession, path, analysisResult.uri,
+        analysisResult.lineInfo, analysisResult.isPart, analysisResult.errors);
+  }
+
   AnalysisDriverUnitIndex _computeIndex(String path) {
     AnalysisResult analysisResult = _computeAnalysisResult(path,
         withUnit: false, asIsIfPartWithoutLibrary: true);

pkg/analyzer/lib/src/dart/element/element.dart

@@ -2418,8 +2418,6 @@ class ElementAnnotationImpl implements ElementAnnotation {
   /// visible for testing.
   static const String _VISIBLE_FOR_TESTING_VARIABLE_NAME = "visibleForTesting";
 
-  /// The element representing the field, variable, or constructor being used as
-  /// an annotation.
   @override
   Element element;
 
@@ -3731,7 +3729,7 @@ abstract class ExecutableElementImpl extends ElementImpl
       var context = enclosingUnit.linkedContext;
       var containerRef = reference.getChild('@parameter');
       var formalParameters = context.getFormalParameters(linkedNode);
-      _parameters = ParameterElementImpl.forLinkedNodeList(
+      return _parameters = ParameterElementImpl.forLinkedNodeList(
         this,
         context,
         containerRef,
@@ -4537,11 +4535,11 @@ class FunctionTypeAliasElementImpl extends ElementImpl
   GenericFunctionTypeElementImpl get function {
     if (_function != null) return _function;
 
-    if (linkedNode != null) {
-      LazyAst.applyResolution(linkedNode);
-      if (linkedNode is GenericTypeAlias) {
-        var context = enclosingUnit.linkedContext;
-        var function = context.getGeneticTypeAliasFunction(linkedNode);
+    var node = linkedNode;
+    if (node != null) {
+      LazyAst.applyResolution(node);
+      if (node is GenericTypeAlias) {
+        var function = node.functionType;
         if (function != null) {
           return _function = GenericFunctionTypeElementImpl.forLinkedNode(
             this,
@@ -4742,17 +4740,20 @@ class GenericFunctionTypeElementImpl extends ElementImpl
 
   @override
   List<ParameterElement> get parameters {
-    if (_parameters == null) {
-      if (linkedNode != null) {
-        var context = enclosingUnit.linkedContext;
-        return _parameters = ParameterElementImpl.forLinkedNodeList(
-          this,
-          context,
-          reference.getChild('@parameter'),
-          context.getFormalParameters(linkedNode),
-        );
-      }
+    if (_parameters != null) return _parameters;
+
+    if (linkedNode != null) {
+      var context = enclosingUnit.linkedContext;
+      var containerRef = reference.getChild('@parameter');
+      var formalParameters = context.getFormalParameters(linkedNode);
+      return _parameters = ParameterElementImpl.forLinkedNodeList(
+        this,
+        context,
+        containerRef,
+        formalParameters,
+      );
     }
+
     return _parameters ?? const <ParameterElement>[];
   }
 
@@ -6569,18 +6570,14 @@ class ParameterElementImpl extends VariableElementImpl
 
     if (linkedNode != null) {
       var context = enclosingUnit.linkedContext;
+      var containerRef = reference.getChild('@parameter');
       var formalParameters = context.getFormalParameters(linkedNode);
-      if (formalParameters != null) {
-        var containerRef = reference.getChild('@parameter');
-        return _parameters = ParameterElementImpl.forLinkedNodeList(
-          this,
-          context,
-          containerRef,
-          formalParameters,
-        );
-      } else {
-        return _parameters ??= const <ParameterElement>[];
-      }
+      return _parameters = ParameterElementImpl.forLinkedNodeList(
+        this,
+        context,
+        containerRef,
+        formalParameters,
+      );
     }
 
     return _parameters ??= const <ParameterElement>[];
@@ -6614,7 +6611,7 @@ class ParameterElementImpl extends VariableElementImpl
     if (_typeParameters != null) return _typeParameters;
 
     if (linkedNode != null) {
-      var typeParameters = linkedContext.getTypeParameters2(linkedNode);
+      var typeParameters = linkedContext.getTypeParameters(linkedNode);
       if (typeParameters == null) {
         return _typeParameters = const [];
       }
@@ -7429,8 +7426,8 @@ class TypeParameterElementImpl extends ElementImpl
     if (_bound != null) return _bound;
 
     if (linkedNode != null) {
-      var context = enclosingUnit.linkedContext;
-      return _bound = context.getTypeParameterBound(linkedNode)?.type;
+      var node = linkedNode as TypeParameter;
+      return _bound = node.bound?.type;
     }
 
     return _bound;
@@ -7565,7 +7562,7 @@ mixin TypeParameterizedElementMixin
 
     if (linkedNode != null) {
       LazyAst.applyResolution(linkedNode);
-      var typeParameters = linkedContext.getTypeParameters2(linkedNode);
+      var typeParameters = linkedContext.getTypeParameters(linkedNode);
       if (typeParameters == null) {
         return _typeParameterElements = const [];
       }