Version 2.11.0-277.0.dev

Merge commit '619e388a1d8ba8263b93cd4e9e5e6c98a00fe0f2' into 'dev'

Author: Dart CI

pkg/analyzer/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.41.0 (Not yet released - breaking changes)
+* Replaced `Scope.lookup({id, setter})` with `lookup(id)`.
+* Deprecated `Scope.lookup2(id)`, use `lookup()` instead.
+* Removed deprecated `Member.baseElement`.
+* Removed deprecated `package:analyzer/analyzer.dart` library.
+* Removed deprecated `ElementAnnotation.constantValue`.
+* Removed deprecated `VariableElement.constantValue`.
+* Removed deprecated `VariableElement.initializer`.
+* Removed deprecated `auxiliaryElements`.
+* The value of`FunctionType.element` for types created from a `typedef`
+  is now `FunctionTypeAliasElement`, not its function element.
+* Removed deprecated `GenericTypeAliasElement`.
+
 ## 0.40.5
 * Deprecated `GenericTypeAliasElement`. Use `FunctionTypeAliasElement`.
 * Read imports, exports, and parts on demand in `AnalysisDriver`.

pkg/analyzer/lib/analyzer.dart

@@ -38,7 +38,6 @@ import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/src/dart/element/element.dart' show AuxiliaryElements;
 import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/source.dart' show LineInfo, Source;
 import 'package:analyzer/src/generated/utilities_dart.dart';
@@ -3235,23 +3234,6 @@ abstract class ImportDirective implements NamespaceDirective {
 /// Clients may not extend, implement or mix-in this class.
 abstract class IndexExpression
     implements NullShortableExpression, MethodReferenceExpression {
-  /// Return the auxiliary elements associated with this identifier, or `null`
-  /// if this identifier is not in both a getter and setter context.
-  ///
-  /// The auxiliary elements hold the static and propagated elements associated
-  /// with the getter context.
-  // TODO(brianwilkerson) Replace this API.
-  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
-      'CompoundAssignmentExpression.writeElement')
-  AuxiliaryElements get auxiliaryElements;
-
-  /// Set the auxiliary elements associated with this identifier to the given
-  /// [elements].
-  // TODO(brianwilkerson) Replace this API.
-  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
-      'CompoundAssignmentExpression.writeElement')
-  set auxiliaryElements(AuxiliaryElements elements);
-
   /// Return the expression used to compute the index.
   Expression get index;
 
@@ -4597,23 +4579,6 @@ abstract class SimpleFormalParameter implements NormalFormalParameter {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class SimpleIdentifier implements Identifier {
-  /// Return the auxiliary elements associated with this identifier, or `null`
-  /// if this identifier is not in both a getter and setter context.
-  ///
-  /// The auxiliary elements hold the static and propagated elements associated
-  /// with the getter context.
-  // TODO(brianwilkerson) Replace this API.
-  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
-      'CompoundAssignmentExpression.writeElement')
-  AuxiliaryElements get auxiliaryElements;
-
-  /// Set the auxiliary elements associated with this identifier to the given
-  /// [elements].
-  // TODO(brianwilkerson) Replace this API.
-  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
-      'CompoundAssignmentExpression.writeElement')
-  set auxiliaryElements(AuxiliaryElements elements);
-
   /// Return `true` if this identifier is the "name" part of a prefixed
   /// identifier or a method invocation.
   bool get isQualified;

pkg/analyzer/lib/dart/ast/ast.dart

@@ -691,12 +691,6 @@ abstract class ElementAnnotation implements ConstantEvaluationTarget {
   /// produced but no errors were generated, then the list will be empty.
   List<AnalysisError> get constantEvaluationErrors;
 
-  /// Return a representation of the value of this annotation, or `null` if the
-  /// value of this annotation has not been computed or if the value could not
-  /// be computed because of errors.
-  @Deprecated('Use computeConstantValue() instead')
-  DartObject get constantValue;
-
   /// Return the element referenced by this annotation.
   ///
   /// In valid code this element can be a [PropertyAccessorElement] getter
@@ -1199,12 +1193,6 @@ abstract class FunctionTypedElement implements TypeParameterizedElement {
 /// Clients may not extend, implement, or mix-in this class.
 abstract class GenericFunctionTypeElement implements FunctionTypedElement {}
 
-/// A synonym for [FunctionTypeAliasElement].
-///
-/// Clients may not extend, implement, or mix-in this class.
-@Deprecated('Use FunctionTypeAliasElement instead')
-abstract class GenericTypeAliasElement implements FunctionTypeAliasElement {}
-
 /// A combinator that causes some of the names in a namespace to be hidden when
 /// being imported.
 ///
@@ -1755,28 +1743,13 @@ abstract class UriReferencedElement implements Element {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class VariableElement implements Element, ConstantEvaluationTarget {
-  /// Return a representation of the value of this variable.
-  ///
-  /// Return `null` if either this variable was not declared with the 'const'
-  /// modifier or if the value of this variable could not be computed because of
-  /// errors.
-  @Deprecated('Use computeConstantValue() instead')
-  DartObject get constantValue;
-
   @override
   VariableElement get declaration;
 
   /// Return `true` if this variable element did not have an explicit type
   /// specified for it.
   bool get hasImplicitType;
 
-  /// Return a synthetic function representing this variable's initializer, or
-  /// `null` if this variable does not have an initializer. The function will
-  /// have no parameters. The return type of the function will be the
-  /// compile-time type of the initialization expression.
-  @deprecated
-  FunctionElement get initializer;
-
   /// Return `true` if this variable was declared with the 'const' modifier.
   bool get isConst;
 

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

@@ -3,20 +3,22 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/element.dart';
-import 'package:meta/meta.dart';
 
 /// Scopes are used to resolve names to elements.
 abstract class Scope {
-  /// Return the element with the name `id` or `id=` (if [setter] is `true`),
-  /// `null` if the name is not defined within this scope.
-  @Deprecated('Use lookup2() that is closer to the language specification')
-  Element lookup({@required String id, @required bool setter});
+  /// Return the result of lexical lookup for the given [id], not `null`.
+  ///
+  /// Getters and setters are bundled, when we found one or another, we are
+  /// done with the lookup, and return both the getter and the setter, if
+  /// available.
+  ScopeLookupResult lookup(String id);
 
   /// Return the result of lexical lookup for the given [id], not `null`.
   ///
   /// Getters and setters are bundled, when we found one or another, we are
   /// done with the lookup, and return both the getter and the setter, if
   /// available.
+  @Deprecated('Use lookup() instead')
   ScopeLookupResult lookup2(String id);
 }
 

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

@@ -15,7 +15,6 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/exception/exception.dart';
 import 'package:analyzer/src/dart/ast/to_source_visitor.dart';
 import 'package:analyzer/src/dart/ast/token.dart';
-import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/fasta/token_utils.dart' as util show findPrevious;
 import 'package:analyzer/src/generated/engine.dart' show AnalysisEngine;
 import 'package:analyzer/src/generated/engine.dart';
@@ -5814,14 +5813,6 @@ class IndexExpressionImpl extends ExpressionImpl
   @override
   MethodElement staticElement;
 
-  /// If this expression is both in a getter and setter context, the
-  /// [AuxiliaryElements] will be set to hold onto the static element from the
-  /// getter context.
-  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
-      'CompoundAssignmentExpression.writeElement')
-  @override
-  AuxiliaryElements auxiliaryElements;
-
   /// Initialize a newly created index expression that is a child of a cascade
   /// expression.
   IndexExpressionImpl.forCascade(this.period, this.question, this.leftBracket,
@@ -8834,14 +8825,6 @@ class SimpleIdentifierImpl extends IdentifierImpl implements SimpleIdentifier {
   /// this identifier could not be resolved.
   Element _staticElement;
 
-  /// If this expression is both in a getter and setter context, the
-  /// [AuxiliaryElements] will be set to hold onto the static element from the
-  /// getter context.
-  @Deprecated('Use CompoundAssignmentExpression.readElement and/or '
-      'CompoundAssignmentExpression.writeElement')
-  @override
-  AuxiliaryElements auxiliaryElements;
-
   @override
   List<DartType> tearOffTypeArgumentTypes;