Version 2.10.0-19.0.dev

Merge commit '78250735aafd8a71356995328ffdffdbb1aaf94e' into 'dev'

Author: Dart CI

.dart_tool/package_config.json

@@ -11,7 +11,7 @@
     "constraint, update this by running tools/generate_package_config.dart."
   ],
   "configVersion": 2,
-  "generated": "2020-08-11T10:59:54.661195",
+  "generated": "2020-08-12T09:00:03.727658",
   "generator": "tools/generate_package_config.dart",
   "packages": [
     {
@@ -298,6 +298,11 @@
       "rootUri": "../pkg/front_end/testcases/nonfunction_type_aliases",
       "packageUri": ".nonexisting/"
     },
+    {
+      "name": "front_end_value_class",
+      "rootUri": "../pkg/front_end/testcases/value_class",
+      "packageUri": ".nonexisting/"
+    },
     {
       "name": "frontend_server",
       "rootUri": "../pkg/frontend_server",

DEPS

@@ -137,7 +137,7 @@ vars = {
   "shelf_static_rev": "v0.2.8",
   "shelf_packages_handler_tag": "2.0.0",
   "shelf_proxy_tag": "0.1.0+7",
-  "shelf_tag": "0.7.3+3",
+  "shelf_rev": "289309adc6c39aab0a63db676d550c517fc1cc2d",
   "shelf_web_socket_tag": "0.2.2+3",
   "source_map_stack_trace_rev": "1c3026f69d9771acf2f8c176a1ab750463309cce",
   "source_maps-0.9.4_rev": "38524",
@@ -394,7 +394,7 @@ deps = {
   Var("dart_root") + "/third_party/pkg/resource":
       Var("dart_git") + "resource.git" + "@" + Var("resource_rev"),
   Var("dart_root") + "/third_party/pkg/shelf":
-      Var("dart_git") + "shelf.git" + "@" + Var("shelf_tag"),
+      Var("dart_git") + "shelf.git" + "@" + Var("shelf_rev"),
   Var("dart_root") + "/third_party/pkg/shelf_packages_handler":
       Var("dart_git") + "shelf_packages_handler.git"
       + "@" + Var("shelf_packages_handler_tag"),

pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.dart

@@ -203,6 +203,10 @@ class _LocalVisitor extends LocalDeclarationVisitor {
   /// A flag indicating whether local fields should be suggested.
   final bool suggestLocalFields;
 
+  /// A flag indicating whether suggestions are being made inside an `extends`
+  /// clause.
+  bool inExtendsClause = false;
+
   /// Only used when [useNewRelevance] is `false`.
   int privateMemberRelevance = DART_RELEVANCE_DEFAULT;
 
@@ -404,7 +408,8 @@ class _LocalVisitor extends LocalDeclarationVisitor {
 
   @override
   void declaredMixin(MixinDeclaration declaration) {
-    if (visibilityTracker._isVisible(declaration.declaredElement) &&
+    if (!inExtendsClause &&
+        visibilityTracker._isVisible(declaration.declaredElement) &&
         opType.includeTypeNameSuggestions) {
       builder.suggestClass(declaration.declaredElement, kind: _defaultKind);
     }
@@ -445,6 +450,12 @@ class _LocalVisitor extends LocalDeclarationVisitor {
     }
   }
 
+  @override
+  void visitExtendsClause(ExtendsClause node) {
+    inExtendsClause = true;
+    return super.visitExtendsClause(node);
+  }
+
   /// Return `true` if the [identifier] is composed of one or more underscore
   /// characters and nothing else.
   bool _isUnused(String identifier) => RegExp(r'^_+$').hasMatch(identifier);

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

@@ -15,6 +15,8 @@ import 'package:analysis_server/src/services/correction/dart/convert_conditional
 import 'package:analysis_server/src/services/correction/dart/convert_documentation_into_line.dart';
 import 'package:analysis_server/src/services/correction/dart/convert_quotes.dart';
 import 'package:analysis_server/src/services/correction/dart/convert_to_contains.dart';
+import 'package:analysis_server/src/services/correction/dart/convert_to_generic_function_syntax.dart';
+import 'package:analysis_server/src/services/correction/dart/convert_to_if_null.dart';
 import 'package:analysis_server/src/services/correction/dart/create_method.dart';
 import 'package:analysis_server/src/services/correction/dart/make_final.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_argument.dart';
@@ -81,8 +83,11 @@ class BulkFixProcessor {
     LintNames.prefer_equal_for_default_values:
         ReplaceColonWithEquals.newInstance,
     LintNames.prefer_final_fields: MakeFinal.newInstance,
+    LintNames.prefer_generic_function_type_aliases:
+        ConvertToGenericFunctionSyntax.newInstance,
     LintNames.prefer_if_elements_to_conditional_expressions:
         ConvertConditionalExpressionToIfElement.newInstance,
+    LintNames.prefer_if_null_operators: ConvertToIfNull.newInstance,
     LintNames.prefer_is_empty: ReplaceWithIsEmpty.newInstance,
     LintNames.prefer_is_not_empty: UesIsNotEmpty.newInstance,
     LintNames.prefer_single_quotes: ConvertToSingleQuotes.newInstance,

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

@@ -42,13 +42,22 @@ class DataDriven extends MultiCorrectionProducer {
     return <TransformSet>[];
   }
 
-  /// Return the name that was changed.
+  /// Return the name of the element that was changed.
   String get _name {
     var node = this.node;
     if (node is SimpleIdentifier) {
       return node.name;
     } else if (node is ConstructorName) {
       return node.name.name;
+    } else if (node is NamedType) {
+      return node.name.name;
+    } else if (node is TypeArgumentList) {
+      var parent = node.parent;
+      if (parent is MethodInvocation) {
+        return parent.methodName.name;
+      } else if (parent is ExtensionOverride) {
+        return parent.extensionName.name;
+      }
     }
     return null;
   }

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

@@ -0,0 +1,178 @@
+// Copyright (c) 2020, 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.
+
+import 'package:analysis_server/src/services/correction/dart/data_driven.dart';
+import 'package:analysis_server/src/services/correction/fix/data_driven/change.dart';
+import 'package:analysis_server/src/services/correction/fix/data_driven/value_extractor.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
+import 'package:meta/meta.dart';
+
+/// The data related to a type parameter that was added to either a function or
+/// a type.
+class AddTypeParameterChange extends Change<_Data> {
+  /// The index of the type parameter that was added.
+  final int index;
+
+  /// The name of the type parameter that was added.
+  final String name;
+
+  /// The name of the type that the type parameter extends, or `null` if the
+  /// type parameter doesn't have a bound.
+  final String extendedType;
+
+  /// The value extractor used to compute the value of the type argument.
+  final ValueExtractor value;
+
+  /// Initialize a newly created change to describe adding a type parameter to a
+  /// type or a function.
+  // TODO(brianwilkerson) Support adding multiple type parameters.
+  AddTypeParameterChange(
+      {@required this.index,
+      @required this.name,
+      @required this.value,
+      this.extendedType})
+      : assert(index >= 0),
+        assert(name != null),
+        assert(value != null);
+
+  @override
+  void apply(DartFileEditBuilder builder, DataDrivenFix fix, _Data data) {
+    if (data is _TypeArgumentData) {
+      _applyToTypeArguments(builder, data);
+    } else {
+      _applyToTypeParameters(builder, data as _TypeParameterData);
+    }
+  }
+
+  @override
+  _Data validate(DataDrivenFix fix) {
+    var node = fix.node;
+    if (node is NamedType) {
+      // wrong_number_of_type_arguments
+      // wrong_number_of_type_arguments_constructor
+      var argument = value.from(node, fix.utils);
+      if (argument == null) {
+        return null;
+      }
+      var typeArguments = node.typeArguments;
+      if (_isInvalidIndex(typeArguments?.arguments)) {
+        return null;
+      }
+      return _TypeArgumentData(typeArguments, argument, node.name.end);
+    }
+    var parent = node.parent;
+    if (parent is InvocationExpression) {
+      // wrong_number_of_type_arguments_method
+      var argument = value.from(parent, fix.utils);
+      if (argument == null) {
+        return null;
+      }
+      var typeArguments = parent.typeArguments;
+      if (_isInvalidIndex(typeArguments?.arguments)) {
+        return null;
+      }
+      return _TypeArgumentData(
+          typeArguments, argument, parent.argumentList.offset);
+    } else if (parent is MethodDeclaration) {
+      // invalid_override
+      var typeParameters = parent.typeParameters;
+      if (_isInvalidIndex(typeParameters?.typeParameters)) {
+        return null;
+      }
+      return _TypeParameterData(typeParameters, parent.name.end);
+    } else if (node is TypeArgumentList && parent is ExtensionOverride) {
+      // wrong_number_of_type_arguments_extension
+      var argument = value.from(node, fix.utils);
+      if (argument == null) {
+        return null;
+      }
+      if (_isInvalidIndex(node?.arguments)) {
+        return null;
+      }
+      return _TypeArgumentData(node, argument, parent.extensionName.end);
+    }
+    return null;
+  }
+
+  void _applyToTypeArguments(
+      DartFileEditBuilder builder, _TypeArgumentData data) {
+    var typeArguments = data.typeArguments;
+    var argumentValue = data.argumentValue;
+    if (typeArguments == null) {
+      // Adding the first type argument.
+      builder.addSimpleInsertion(data.newListOffset, '<$argumentValue>');
+    } else {
+      if (index == 0) {
+        // Inserting the type argument at the beginning of the list.
+        builder.addSimpleInsertion(
+            typeArguments.leftBracket.end, '$argumentValue, ');
+      } else {
+        // Inserting the type argument after an existing type argument.
+        var previous = typeArguments.arguments[index - 1];
+        builder.addSimpleInsertion(previous.end, ', $argumentValue');
+      }
+    }
+  }
+
+  void _applyToTypeParameters(
+      DartFileEditBuilder builder, _TypeParameterData data) {
+    var argumentValue =
+        extendedType == null ? name : '$name extends $extendedType';
+    var typeParameters = data.typeParameters;
+    if (typeParameters == null) {
+      // Adding the first type argument.
+      builder.addSimpleInsertion(data.newListOffset, '<$argumentValue>');
+    } else {
+      if (index == 0) {
+        // Inserting the type argument at the beginning of the list.
+        builder.addSimpleInsertion(
+            typeParameters.leftBracket.end, '$argumentValue, ');
+      } else {
+        // Inserting the type argument after an existing type argument.
+        var previous = typeParameters.typeParameters[index - 1];
+        builder.addSimpleInsertion(previous.end, ', $argumentValue');
+      }
+    }
+  }
+
+  bool _isInvalidIndex(List<AstNode> list) {
+    var length = list == null ? 0 : list.length;
+    return index > length;
+  }
+}
+
+/// The data returned when adding a type parameter.
+class _Data {}
+
+/// The data returned when updating a type argument list.
+class _TypeArgumentData extends _Data {
+  /// The list of type arguments to which a new type argument is being added, or
+  /// `null` if the first type argument is being added.
+  final TypeArgumentList typeArguments;
+
+  /// The value of the type argument being added.
+  final String argumentValue;
+
+  /// The offset at which the type argument list should be inserted if
+  /// [typeArguments] is `null`.
+  final int newListOffset;
+
+  /// Initialize newly created data.
+  _TypeArgumentData(this.typeArguments, this.argumentValue, this.newListOffset);
+}
+
+/// The data returned when updating a type parameter list.
+class _TypeParameterData extends _Data {
+  /// The list of type parameters to which a new type paramete is being added,
+  /// or `null` if the first type parameter is being added.
+  final TypeParameterList typeParameters;
+
+  /// The offset at which the type parameter list should be inserted if
+  /// [typeParameters] is `null`.
+  final int newListOffset;
+
+  /// Initialize newly created data.
+  _TypeParameterData(this.typeParameters, this.newListOffset);
+}