Version 2.11.0-230.0.dev

Merge commit 'e5f1b4bb2cf3fe136d8a8fc7313619cf93c07944' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart

@@ -297,6 +297,9 @@ class BulkFixProcessor {
     CompileTimeErrorCode.UNDEFINED_METHOD: [
       DataDriven.newInstance,
     ],
+    CompileTimeErrorCode.UNDEFINED_NAMED_PARAMETER: [
+      DataDriven.newInstance,
+    ],
     CompileTimeErrorCode.UNDEFINED_SETTER: [
       DataDriven.newInstance,
     ],

pkg/analysis_server/lib/src/services/correction/dart/data_driven.dart

@@ -101,7 +101,11 @@ class DataDriven extends MultiCorrectionProducer {
       return const [ElementKind.extensionKind];
     } else if (node is InstanceCreationExpression) {
       return const [ElementKind.constructorKind];
+    } else if (node is Label) {
+      var argumentList = node.parent.parent;
+      return _kindsForNode(argumentList.parent, child: argumentList);
     } else if (node is MethodInvocation) {
+      assert(child != null);
       if (node.target == child) {
         return const [
           ElementKind.classKind,

pkg/analysis_server/lib/src/services/correction/fix/data_driven/modify_parameters.dart

@@ -226,6 +226,11 @@ class ModifyParameters extends Change<_Data> {
     if (parent is InvocationExpression) {
       var argumentList = parent.argumentList;
       return _Data(argumentList);
+    } else if (parent is Label) {
+      var argumentList = parent.parent.parent;
+      if (argumentList is ArgumentList) {
+        return _Data(argumentList);
+      }
     }
     return null;
   }

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -591,6 +591,7 @@ class FixProcessor extends BaseProcessor {
     ],
     CompileTimeErrorCode.UNDEFINED_NAMED_PARAMETER: [
       ChangeArgumentName.newInstance,
+      DataDriven.newInstance,
     ],
     CompileTimeErrorCode.UNDEFINED_SETTER: [
       DataDriven.newInstance,

pkg/analysis_server/test/src/services/correction/fix/data_driven/modify_parameters_test.dart

@@ -642,6 +642,31 @@ void f(C c) {
 ''');
   }
 
+  Future<void>
+      test_remove_middle_optionalNamed_withArg_notRenamed_deprecated() async {
+    setPackageContent('''
+class C {
+  void m({int a, @deprecated int b, int c}) {}
+}
+''');
+    setPackageData(
+        _modify(['C', 'm'], [RemoveParameter(NamedParameterReference('b'))]));
+    await resolveTestUnit('''
+import '$importUri';
+
+void f(C c) {
+  c.m(a: 0, b: 1, c: 2);
+}
+''');
+    await assertHasFix('''
+import '$importUri';
+
+void f(C c) {
+  c.m(a: 0, c: 2);
+}
+''');
+  }
+
   Future<void> test_remove_multiple_deprecated() async {
     setPackageContent('''
 class C {

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

@@ -85,7 +85,7 @@ typedef WorkToWaitAfterComputingResult = Future<void> Function(String path);
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 112;
+  static const int DATA_VERSION = 114;
 
   /// The length of the list returned by [_computeDeclaredVariablesSignature].
   static const int _declaredVariablesSignatureLength = 4;

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

@@ -42,6 +42,7 @@ import 'package:analyzer/src/generated/utilities_collection.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/generated/utilities_general.dart';
 import 'package:analyzer/src/summary/idl.dart';
+import 'package:analyzer/src/summary2/lazy_ast.dart';
 import 'package:analyzer/src/summary2/linked_unit_context.dart';
 import 'package:analyzer/src/summary2/reference.dart';
 import 'package:analyzer/src/util/comment.dart';
@@ -500,6 +501,7 @@ class ClassElementImpl extends AbstractClassElementImpl
 
     if (linkedNode != null) {
       if (linkedNode is ClassOrMixinDeclaration) {
+        LazyAst.applyResolution(linkedNode);
         _createPropertiesAndAccessors();
         assert(_accessors != null);
         return _accessors;
@@ -544,6 +546,7 @@ class ClassElementImpl extends AbstractClassElementImpl
     }
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var context = enclosingUnit.linkedContext;
       var containerRef = reference.getChild('@constructor');
       _constructors = context.getConstructors(linkedNode).map((node) {
@@ -605,6 +608,7 @@ class ClassElementImpl extends AbstractClassElementImpl
 
     if (linkedNode != null) {
       if (linkedNode is ClassOrMixinDeclaration) {
+        LazyAst.applyResolution(linkedNode);
         _createPropertiesAndAccessors();
         assert(_fields != null);
         return _fields;
@@ -705,6 +709,7 @@ class ClassElementImpl extends AbstractClassElementImpl
     }
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var context = enclosingUnit.linkedContext;
       var implementsClause = context.getImplementsClause(linkedNode);
       if (implementsClause != null) {
@@ -780,6 +785,7 @@ class ClassElementImpl extends AbstractClassElementImpl
     }
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var context = enclosingUnit.linkedContext;
       var containerRef = reference.getChild('@method');
       return _methods = context
@@ -816,6 +822,7 @@ class ClassElementImpl extends AbstractClassElementImpl
     }
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var context = enclosingUnit.linkedContext;
       var withClause = context.getWithClause(linkedNode);
       if (withClause != null) {
@@ -865,7 +872,18 @@ class ClassElementImpl extends AbstractClassElementImpl
     }
 
     if (linkedNode != null) {
-      var type = linkedContext.getSuperclass(linkedNode)?.type;
+      var node = linkedNode;
+      LazyAst.applyResolution(node);
+
+      DartType type;
+      if (node is ClassDeclaration) {
+        type = node.extendsClause?.superclass?.type;
+      } else if (node is ClassTypeAlias) {
+        type = linkedContext.getSuperclass(linkedNode)?.type;
+      } else {
+        throw UnimplementedError('${node.runtimeType}');
+      }
+
       if (_isInterfaceTypeClass(type)) {
         return _supertype = type;
       }
@@ -1964,9 +1982,9 @@ class ConstructorElementImpl extends ExecutableElementImpl
     if (_constantInitializers != null) return _constantInitializers;
 
     if (linkedNode != null) {
-      return _constantInitializers = linkedContext.getConstructorInitializers(
-        linkedNode,
-      );
+      var node = linkedNode as ConstructorDeclaration;
+      LazyAst.applyResolution(node);
+      return _constantInitializers = node.initializers;
     }
 
     return _constantInitializers;
@@ -2080,13 +2098,13 @@ class ConstructorElementImpl extends ExecutableElementImpl
     if (_redirectedConstructor != null) return _redirectedConstructor;
 
     if (linkedNode != null) {
-      var context = enclosingUnit.linkedContext;
+      var node = linkedNode as ConstructorDeclaration;
+      LazyAst.applyResolution(node);
       if (isFactory) {
-        var node = context.getConstructorRedirected(linkedNode);
-        return _redirectedConstructor = node?.staticElement;
+        return _redirectedConstructor =
+            node.redirectedConstructor?.staticElement;
       } else {
-        var initializers = context.getConstructorInitializers(linkedNode);
-        for (var initializer in initializers) {
+        for (var initializer in node.initializers) {
           if (initializer is RedirectingConstructorInvocation) {
             return _redirectedConstructor = initializer.staticElement;
           }
@@ -2214,6 +2232,7 @@ mixin ConstVariableElement implements ElementImpl, ConstantEvaluationTarget {
     if (_constantInitializer != null) return _constantInitializer;
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var context = enclosingUnit.linkedContext;
       return _constantInitializer = context.readInitializer(linkedNode);
     }
@@ -2984,8 +3003,10 @@ abstract class ElementImpl implements Element {
 
   @override
   List<ElementAnnotation> get metadata {
+    if (_metadata != null) return _metadata;
+
     if (linkedNode != null) {
-      if (_metadata != null) return _metadata;
+      LazyAst.applyResolution(linkedNode);
       var metadata = linkedContext.getMetadata(linkedNode);
       return _metadata = _buildAnnotations2(enclosingUnit, metadata);
     }
@@ -3491,6 +3512,9 @@ class EnumElementImpl extends AbstractClassElementImpl {
   ConstructorElement getNamedConstructor(String name) => null;
 
   void _resynthesizeMembers2() {
+    var node = linkedNode as EnumDeclaration;
+    LazyAst.applyResolution(node);
+
     var fields = <FieldElementImpl>[];
     var getters = <PropertyAccessorElementImpl>[];
 
@@ -3518,7 +3542,7 @@ class EnumElementImpl extends AbstractClassElementImpl {
 
     // Build fields for all enum constants.
     var containerRef = reference.getChild('@constant');
-    var constants = linkedContext.getEnumConstants(linkedNode);
+    var constants = node.constants;
     for (var i = 0; i < constants.length; ++i) {
       var constant = constants[i];
       var name = constant.name.name;
@@ -3703,6 +3727,7 @@ abstract class ExecutableElementImpl extends ElementImpl
     if (_parameters != null) return _parameters;
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var context = enclosingUnit.linkedContext;
       var containerRef = reference.getChild('@parameter');
       var formalParameters = context.getFormalParameters(linkedNode);
@@ -3741,6 +3766,7 @@ abstract class ExecutableElementImpl extends ElementImpl
     if (_returnType != null) return _returnType;
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var context = enclosingUnit.linkedContext;
       return _returnType = context.getReturnType(linkedNode);
     }
@@ -3929,6 +3955,7 @@ class ExtensionElementImpl extends ElementImpl
 
     if (linkedNode != null) {
       if (linkedNode is ExtensionDeclaration) {
+        LazyAst.applyResolution(linkedNode);
         _createPropertiesAndAccessors();
         assert(_accessors != null);
         return _accessors;
@@ -3988,7 +4015,9 @@ class ExtensionElementImpl extends ElementImpl
     if (_extendedType != null) return _extendedType;
 
     if (linkedNode != null) {
-      return _extendedType = linkedContext.getExtendedType(linkedNode).type;
+      var node = linkedNode as ExtensionDeclaration;
+      LazyAst.applyResolution(linkedNode);
+      return _extendedType = node.extendedType.type;
     }
 
     return _extendedType;
@@ -4002,6 +4031,7 @@ class ExtensionElementImpl extends ElementImpl
 
     if (linkedNode != null) {
       if (linkedNode is ExtensionDeclaration) {
+        LazyAst.applyResolution(linkedNode);
         _createPropertiesAndAccessors();
         assert(_fields != null);
         return _fields;
@@ -4041,6 +4071,7 @@ class ExtensionElementImpl extends ElementImpl
     }
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var context = enclosingUnit.linkedContext;
       var containerRef = reference.getChild('@method');
       return _methods = context
@@ -4507,14 +4538,16 @@ class FunctionTypeAliasElementImpl extends ElementImpl
     if (_function != null) return _function;
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       if (linkedNode is GenericTypeAlias) {
         var context = enclosingUnit.linkedContext;
         var function = context.getGeneticTypeAliasFunction(linkedNode);
         if (function != null) {
-          var reference = context.getGenericFunctionTypeReference(function);
-          _function = reference.element;
-          encloseElement(_function);
-          return _function;
+          return _function = GenericFunctionTypeElementImpl.forLinkedNode(
+            this,
+            reference.getChild('@function'),
+            function,
+          );
         } else {
           return _function = GenericFunctionTypeElementImpl.forOffset(-1)
             ..typeParameters = const <TypeParameterElement>[]
@@ -5839,8 +5872,10 @@ class MixinElementImpl extends ClassElementImpl {
     if (_superclassConstraints != null) return _superclassConstraints;
 
     if (linkedNode != null) {
+      var node = linkedNode as MixinDeclaration;
+      LazyAst.applyResolution(node);
       List<InterfaceType> constraints;
-      var onClause = enclosingUnit.linkedContext.getOnClause(linkedNode);
+      var onClause = node.onClause;
       if (onClause != null) {
         constraints = onClause.superclassConstraints
             .map((node) => node.type)
@@ -6565,8 +6600,9 @@ class ParameterElementImpl extends VariableElementImpl
 
   @override
   DartType get typeInternal {
+    if (_type != null) return _type;
+
     if (linkedNode != null) {
-      if (_type != null) return _type;
       var context = enclosingUnit.linkedContext;
       return _type = context.getType(linkedNode);
     }
@@ -7159,6 +7195,7 @@ abstract class PropertyInducingElementImpl
   DartType get typeInternal {
     if (linkedNode != null) {
       if (_type != null) return _type;
+      LazyAst.applyResolution(linkedNode);
       _type = linkedContext.getType(linkedNode);
 
       // While performing inference during linking, the first step is to collect
@@ -7527,13 +7564,19 @@ mixin TypeParameterizedElementMixin
     if (_typeParameterElements != null) return _typeParameterElements;
 
     if (linkedNode != null) {
+      LazyAst.applyResolution(linkedNode);
       var typeParameters = linkedContext.getTypeParameters2(linkedNode);
       if (typeParameters == null) {
         return _typeParameterElements = const [];
       }
       var containerRef = reference.getChild('@typeParameter');
       return _typeParameterElements =
           typeParameters.typeParameters.map<TypeParameterElement>((node) {
+        var element = node.declaredElement;
+        if (element != null) {
+          return element;
+        }
+
         var reference = containerRef.getChild(node.name.name);
         if (reference.hasElementFor(node)) {
           return reference.element as TypeParameterElement;

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

@@ -242,7 +242,6 @@ abstract class ExecutableMember extends Member implements ExecutableElement {
       for (var entry in member._substitution.map.entries) {
         map[entry.key] = substitution.substituteType(entry.value);
       }
-      map.addAll(substitution.map);
       combined = Substitution.fromMap(map);
     } else {
       typeProvider = element.library.typeProvider;

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

@@ -1230,6 +1230,19 @@ class TypeSystemImpl implements TypeSystem {
       typeParameters,
       considerExtendsClause: false,
     );
+
+    // It is an error to use a generic function type as a bound.
+    // What is worse, inference does not do anything to their type formals.
+    // So, we might be left with bounds of their type formals not replaced.
+    // Then we cannot store this linked information, because it references
+    // types that are not in scope.
+    for (var i = 0; i < inferredTypes.length; i++) {
+      var inferredType = inferredTypes[i];
+      if (inferredType is FunctionType && inferredType.typeFormals.isNotEmpty) {
+        inferredTypes[i] = DynamicTypeImpl.instance;
+      }
+    }
+
     var substitution = Substitution.fromPairs(typeParameters, inferredTypes);
 
     for (int i = 0; i < srcTypes.length; i++) {