Version 3.8.0-28.0.dev

Merge 496749a into dev

DEPS

@@ -141,7 +141,7 @@ vars = {
   "markdown_rev": "19aaded4300d24bedcbf52ade792b203ddf030b0",
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   # dart-native-interop-team@ is rolling breaking changes manually while the assets features are in experimental.
-  "native_rev": "fe6ba55d16fe2354d90c73e7a8e7a021b77a884a", # disable tools/rev_sdk_deps.dart
+  "native_rev": "c817a5e41220de370cbea6e6445e63cdc7087544", # disable tools/rev_sdk_deps.dart
   "protobuf_rev": "b7dd58cdbd879beee4c3fbf8ee80fce8e97bad26",
   "pub_rev": "710265bae23ad5860f33287fba10b5c369f19a93", # disable tools/rev_sdk_deps.dart
   "shelf_rev": "bf799519cda2898a7c5af06dcfdd5fe6443afd79",

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

@@ -17,6 +17,7 @@ import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/extensions.dart';
 import 'package:analyzer/src/dart/element/member.dart';
+import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/type_algebra.dart';
 import 'package:analyzer/src/dart/resolver/applicable_extensions.dart';
 import 'package:analyzer/src/dart/resolver/scope.dart';
@@ -491,9 +492,10 @@ class DeclarationHelper {
           targetLibrary: libraryElement,
           // Ignore nullability, consistent with non-extension members.
           targetType:
-              type.isDartCoreNull
-                  ? type
-                  : library.typeSystem.promoteToNonNull(type),
+              (type.isDartCoreNull
+                      ? type
+                      : library.typeSystem.promoteToNonNull(type))
+                  as TypeImpl,
           strictCasts: false,
         );
     var importData = ImportData(
@@ -749,9 +751,10 @@ class DeclarationHelper {
       targetLibrary: libraryElement,
       // Ignore nullability, consistent with non-extension members.
       targetType:
-          type.isDartCoreNull
-              ? type
-              : libraryElement.typeSystem.promoteToNonNull(type),
+          (type.isDartCoreNull
+                  ? type
+                  : libraryElement.typeSystem.promoteToNonNull(type))
+              as TypeImpl,
       strictCasts: false,
     );
     for (var instantiatedExtension in applicableExtensions) {

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

@@ -7,6 +7,7 @@ import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
+import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/resolver/applicable_extensions.dart';
 import 'package:analyzer/src/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
@@ -283,7 +284,7 @@ abstract class _CreateExtensionMember extends ResolvedCorrectionProducer {
         var element = existingExtension.declaredFragment!.element;
         var instantiated = [element].applicableTo(
           targetLibrary: libraryElement2,
-          targetType: targetType,
+          targetType: targetType as TypeImpl,
           strictCasts: true,
         );
         if (instantiated.isNotEmpty) {

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

@@ -16,6 +16,7 @@ import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
+import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/resolver/applicable_extensions.dart';
 import 'package:analyzer_plugin/src/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/src/utilities/library.dart';
@@ -88,7 +89,10 @@ class ImportLibrary extends MultiCorrectionProducer {
       foundImport = true;
       var instantiatedExtensions = importedLibrary.exportedExtensions
           .havingMemberWithBaseName(memberName)
-          .applicableTo(targetLibrary: libraryElement2, targetType: targetType);
+          .applicableTo(
+            targetLibrary: libraryElement2,
+            targetType: targetType as TypeImpl,
+          );
       for (var instantiatedExtension in instantiatedExtensions) {
         // If the import has a combinator that needs to be updated, then offer
         // to update it.
@@ -755,7 +759,10 @@ class _ImportLibraryContainingExtension extends ResolvedCorrectionProducer {
   Future<void> compute(ChangeBuilder builder) async {
     var instantiatedExtensions = library.exportedExtensions
         .havingMemberWithBaseName(memberName)
-        .applicableTo(targetLibrary: libraryElement2, targetType: targetType);
+        .applicableTo(
+          targetLibrary: libraryElement2,
+          targetType: targetType as TypeImpl,
+        );
     if (instantiatedExtensions.isNotEmpty) {
       await builder.addDartFileEdit(file, (builder) {
         _uriText = builder.importLibrary(library.uri);

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

@@ -10,6 +10,7 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
+import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/resolver/applicable_extensions.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
@@ -113,7 +114,7 @@ class _UseDifferentDivisionOperator extends ResolvedCorrectionProducer {
               .havingMemberWithBaseName(name)
               .applicableTo(
                 targetLibrary: libraryElement2,
-                targetType: leftType!,
+                targetType: leftType! as TypeImpl,
               )
               .isNotEmpty;
         }).isEmpty;

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

@@ -6657,7 +6657,8 @@ final class ExtensionOverrideImpl extends ExpressionImpl
 
   @experimental
   @override
-  ExtensionElement2 get element2 => (element as ExtensionFragment).element;
+  ExtensionElementImpl2 get element2 =>
+      (element as ExtensionElementImpl).element;
 
   @override
   Token get endToken => _argumentList.endToken;

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

@@ -1592,7 +1592,7 @@ class ConstructorElementImpl extends ExecutableElementImpl
   }
 
   @override
-  FunctionType get type {
+  FunctionTypeImpl get type {
     // TODO(scheglov): Remove "element" in the breaking changes branch.
     return _type ??= FunctionTypeImpl(
       typeFormals: typeParameters,
@@ -3732,7 +3732,7 @@ abstract class ExecutableElementImpl extends _ExistingElementImpl
   TypeImpl? _returnType;
 
   /// The type of function defined by this executable element.
-  FunctionType? _type;
+  FunctionTypeImpl? _type;
 
   @override
   ElementLinkedData? linkedData;
@@ -3887,7 +3887,7 @@ abstract class ExecutableElementImpl extends _ExistingElementImpl
   }
 
   @override
-  FunctionType get type {
+  FunctionTypeImpl get type {
     if (_type != null) return _type!;
 
     return _type = FunctionTypeImpl(
@@ -3898,7 +3898,7 @@ abstract class ExecutableElementImpl extends _ExistingElementImpl
     );
   }
 
-  set type(FunctionType type) {
+  set type(FunctionTypeImpl type) {
     _type = type;
   }
 
@@ -4084,7 +4084,7 @@ class ExtensionElementImpl2 extends InstanceElementImpl2
   final ExtensionElementImpl firstFragment;
 
   @override
-  DartType extendedType = InvalidTypeImpl.instance;
+  TypeImpl extendedType = InvalidTypeImpl.instance;
 
   ExtensionElementImpl2(this.reference, this.firstFragment) {
     reference.element2 = this;
@@ -4663,6 +4663,9 @@ class FormalParameterElementImpl extends PromotableElementImpl2
 /// [FormalParameterElement].
 mixin FormalParameterElementMixin
     implements FormalParameterElement, SharedNamedFunctionParameter {
+  @override
+  TypeImpl get type;
+
   @override
   void appendToWithoutDelimiters2(StringBuffer buffer) {
     buffer.write(
@@ -5116,7 +5119,7 @@ mixin FragmentedFunctionTypedElementMixin<E extends ExecutableFragment>
   // TODO(augmentations): This is wrong. The function type needs to be a merge
   //  of the function types of all of the fragments, but I don't know how to
   //  perform that merge.
-  FunctionType get type {
+  FunctionTypeImpl get type {
     if (firstFragment is ExecutableElementImpl) {
       return (firstFragment as ExecutableElementImpl).type;
     } else if (firstFragment is FunctionTypedElementImpl) {
@@ -5246,6 +5249,9 @@ class FunctionElementImpl extends ExecutableElementImpl
 abstract class FunctionTypedElementImpl
     implements _ExistingElementImpl, FunctionTypedElement {
   set returnType(DartType returnType);
+
+  @override
+  FunctionTypeImpl get type;
 }
 
 abstract class FunctionTypedElementImpl2 extends TypeParameterizedElementImpl2
@@ -5277,7 +5283,7 @@ class GenericFunctionTypeElementImpl extends _ExistingElementImpl
   bool isNullable = false;
 
   /// The type defined by this element.
-  FunctionType? _type;
+  FunctionTypeImpl? _type;
 
   late final GenericFunctionTypeElementImpl2 _element2 =
       GenericFunctionTypeElementImpl2(this);
@@ -5361,7 +5367,7 @@ class GenericFunctionTypeElementImpl extends _ExistingElementImpl
   }
 
   @override
-  FunctionType get type {
+  FunctionTypeImpl get type {
     if (_type != null) return _type!;
 
     return _type = FunctionTypeImpl(
@@ -5375,7 +5381,7 @@ class GenericFunctionTypeElementImpl extends _ExistingElementImpl
 
   /// Set the function type defined by this function type element to the given
   /// [type].
-  set type(FunctionType type) {
+  set type(FunctionTypeImpl type) {
     _type = type;
   }
 
@@ -8262,10 +8268,15 @@ final class MetadataImpl implements Metadata {
   }
 }
 
+abstract class MethodElement2OrMember implements MethodElement2 {
+  @override
+  FunctionTypeImpl get type;
+}
+
 /// A concrete implementation of a [MethodElement].
 class MethodElementImpl extends ExecutableElementImpl
     with AugmentableElement<MethodElementImpl>
-    implements MethodElement, MethodFragment {
+    implements MethodElementOrMember, MethodFragment {
   @override
   late MethodElementImpl2 element;
 
@@ -8365,7 +8376,7 @@ class MethodElementImpl2 extends ExecutableElementImpl2
         FragmentedAnnotatableElementMixin<MethodFragment>,
         FragmentedElementMixin<MethodFragment>,
         _HasSinceSdkVersionMixin
-    implements MethodElement2 {
+    implements MethodElement2OrMember {
   @override
   final Reference reference;
 
@@ -8422,6 +8433,11 @@ class MethodElementImpl2 extends ExecutableElementImpl2
   }
 }
 
+abstract class MethodElementOrMember implements MethodElement {
+  @override
+  FunctionTypeImpl get type;
+}
+
 /// A [ClassElementImpl] representing a mixin declaration.
 class MixinElementImpl extends ClassOrMixinElementImpl
     with AugmentableElement<MixinElementImpl>
@@ -9535,6 +9551,9 @@ mixin ParameterElementMixin implements ParameterElement {
   // Overridden to remove the 'deprecated' annotation.
   ParameterKind get parameterKind;
 
+  @override
+  TypeImpl get type;
+
   @override
   void appendToWithoutDelimiters(
     StringBuffer buffer, {
@@ -10141,7 +10160,7 @@ class PropertyAccessorElementImpl_ImplicitGetter
   Version? get sinceSdkVersion => variable2.sinceSdkVersion;
 
   @override
-  FunctionType get type {
+  FunctionTypeImpl get type {
     return _type ??= FunctionTypeImpl(
       typeFormals: const <TypeParameterElement>[],
       parameters: const <ParameterElement>[],
@@ -10207,7 +10226,7 @@ class PropertyAccessorElementImpl_ImplicitSetter
   Version? get sinceSdkVersion => variable2.sinceSdkVersion;
 
   @override
-  FunctionType get type {
+  FunctionTypeImpl get type {
     return _type ??= FunctionTypeImpl(
       typeFormals: const <TypeParameterElement>[],
       parameters: parameters,
@@ -11116,7 +11135,7 @@ class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
   }
 
   @override
-  DartType get aliasedType => firstFragment.aliasedType;
+  TypeImpl get aliasedType => firstFragment.aliasedType;
 
   @override
   TypeAliasElementImpl2 get baseElement => this;