commit e86b73617262df6fcbd9c082a1e8cade019a62b3
author Konstantin Shcheglov <scheglov@google.com> Fri Jul 04 10:48:41 2025 -0700
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 04 10:48:41 2025 -0700
tree 87a02697b399f4451ce0203872b85e21b69e4d7d
parent 00d61ac73ba04677fe0cf591acfa740cb6c49284

Elements. Inline WrappedElementMixin.

It does not represent a significant abstraction to justify existance.

Change-Id: I7771e40a3cfbd082f7b63219e0806511db378dee
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/438741
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>

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

diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index a547668..5e8202f 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -5409,10 +5409,7 @@
       variables.cast<PatternVariableFragment>();
 }
 
-class LabelElementImpl extends ElementImpl
-    with WrappedElementMixin
-    implements LabelElement {
-  @override
+class LabelElementImpl extends ElementImpl implements LabelElement {
   final LabelFragmentImpl _wrappedElement;
 
   LabelElementImpl(this._wrappedElement);
@@ -5440,6 +5437,9 @@
   bool get isOnSwitchMember => _wrappedElement.isOnSwitchMember;
 
   @override
+  bool get isSynthetic => _wrappedElement.isSynthetic;
+
+  @override
   ElementKind get kind => ElementKind.LABEL;
 
   @override
@@ -5450,6 +5450,9 @@
   LibraryElement get library2 => library;
 
   @override
+  String? get name3 => _wrappedElement.name2;
+
+  @override
   T? accept<T>(ElementVisitor2<T> visitor) {
     return visitor.visitLabelElement(this);
   }
@@ -5459,6 +5462,15 @@
   T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
 
   @override
+  String displayString2({
+    bool multiline = false,
+    bool preferTypeAlias = false,
+  }) => _wrappedElement.getDisplayString(
+    multiline: multiline,
+    preferTypeAlias: preferTypeAlias,
+  );
+
+  @override
   void visitChildren2<T>(ElementVisitor2<T> visitor) {}
 }
 
@@ -6679,9 +6691,7 @@
 }
 
 class LocalFunctionElementImpl extends ExecutableElementImpl
-    with WrappedElementMixin
     implements LocalFunctionElement {
-  @override
   final LocalFunctionFragmentImpl _wrappedElement;
 
   LocalFunctionElementImpl(this._wrappedElement);
@@ -6737,6 +6747,9 @@
   bool get isStatic => _wrappedElement.isStatic;
 
   @override
+  bool get isSynthetic => _wrappedElement.isSynthetic;
+
+  @override
   ElementKind get kind => ElementKind.FUNCTION;
 
   @override
@@ -6747,6 +6760,9 @@
   MetadataImpl get metadata2 => metadata;
 
   @override
+  String? get name3 => _wrappedElement.name2;
+
+  @override
   TypeImpl get returnType => _wrappedElement.returnType;
 
   @override
@@ -6770,6 +6786,15 @@
   @Deprecated('Use accept instead')
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
+
+  @override
+  String displayString2({
+    bool multiline = false,
+    bool preferTypeAlias = false,
+  }) => _wrappedElement.getDisplayString(
+    multiline: multiline,
+    preferTypeAlias: preferTypeAlias,
+  );
 }
 
 /// A concrete implementation of a [LocalFunctionFragment].
@@ -6798,9 +6823,8 @@
 }
 
 class LocalVariableElementImpl extends PromotableElementImpl
-    with WrappedElementMixin, _NonTopLevelVariableOrParameter
+    with _NonTopLevelVariableOrParameter
     implements LocalVariableElement {
-  @override
   final LocalVariableFragmentImpl _wrappedElement;
 
   @override
@@ -6841,6 +6865,9 @@
   bool get isStatic => _wrappedElement.isStatic;
 
   @override
+  bool get isSynthetic => _wrappedElement.isSynthetic;
+
+  @override
   ElementKind get kind => ElementKind.LOCAL_VARIABLE;
 
   @override
@@ -6857,9 +6884,8 @@
   @override
   MetadataImpl get metadata2 => metadata;
 
-  LocalVariableFragmentImpl get wrappedElement {
-    return _wrappedElement;
-  }
+  @override
+  String? get name3 => _wrappedElement.name2;
 
   @override
   FragmentImpl? get _enclosingFunction => _wrappedElement.enclosingElement3;
@@ -10147,25 +10173,6 @@
   }
 }
 
-mixin WrappedElementMixin implements ElementImpl {
-  @override
-  bool get isSynthetic => _wrappedElement.isSynthetic;
-
-  @override
-  String? get name3 => _wrappedElement.name2;
-
-  FragmentImpl get _wrappedElement;
-
-  @override
-  String displayString2({
-    bool multiline = false,
-    bool preferTypeAlias = false,
-  }) => _wrappedElement.getDisplayString(
-    multiline: multiline,
-    preferTypeAlias: preferTypeAlias,
-  );
-}
-
 abstract class _ExistingFragmentImpl extends FragmentImpl
     with _HasLibraryMixin {
   _ExistingFragmentImpl({required super.nameOffset});