Skip to content

Commit e86b736

Browse files
scheglovCommit Queue
authored andcommitted
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 <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent 00d61ac commit e86b736

File tree

1 file changed

+37
-30
lines changed

1 file changed

+37
-30
lines changed

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

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5409,10 +5409,7 @@ class JoinPatternVariableFragmentImpl extends PatternVariableFragmentImpl
54095409
variables.cast<PatternVariableFragment>();
54105410
}
54115411

5412-
class LabelElementImpl extends ElementImpl
5413-
with WrappedElementMixin
5414-
implements LabelElement {
5415-
@override
5412+
class LabelElementImpl extends ElementImpl implements LabelElement {
54165413
final LabelFragmentImpl _wrappedElement;
54175414

54185415
LabelElementImpl(this._wrappedElement);
@@ -5439,6 +5436,9 @@ class LabelElementImpl extends ElementImpl
54395436
/// or `default`).
54405437
bool get isOnSwitchMember => _wrappedElement.isOnSwitchMember;
54415438

5439+
@override
5440+
bool get isSynthetic => _wrappedElement.isSynthetic;
5441+
54425442
@override
54435443
ElementKind get kind => ElementKind.LABEL;
54445444

@@ -5449,6 +5449,9 @@ class LabelElementImpl extends ElementImpl
54495449
@override
54505450
LibraryElement get library2 => library;
54515451

5452+
@override
5453+
String? get name3 => _wrappedElement.name2;
5454+
54525455
@override
54535456
T? accept<T>(ElementVisitor2<T> visitor) {
54545457
return visitor.visitLabelElement(this);
@@ -5458,6 +5461,15 @@ class LabelElementImpl extends ElementImpl
54585461
@override
54595462
T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
54605463

5464+
@override
5465+
String displayString2({
5466+
bool multiline = false,
5467+
bool preferTypeAlias = false,
5468+
}) => _wrappedElement.getDisplayString(
5469+
multiline: multiline,
5470+
preferTypeAlias: preferTypeAlias,
5471+
);
5472+
54615473
@override
54625474
void visitChildren2<T>(ElementVisitor2<T> visitor) {}
54635475
}
@@ -6679,9 +6691,7 @@ final class LoadLibraryFunctionProvider {
66796691
}
66806692

66816693
class LocalFunctionElementImpl extends ExecutableElementImpl
6682-
with WrappedElementMixin
66836694
implements LocalFunctionElement {
6684-
@override
66856695
final LocalFunctionFragmentImpl _wrappedElement;
66866696

66876697
LocalFunctionElementImpl(this._wrappedElement);
@@ -6736,6 +6746,9 @@ class LocalFunctionElementImpl extends ExecutableElementImpl
67366746
@override
67376747
bool get isStatic => _wrappedElement.isStatic;
67386748

6749+
@override
6750+
bool get isSynthetic => _wrappedElement.isSynthetic;
6751+
67396752
@override
67406753
ElementKind get kind => ElementKind.FUNCTION;
67416754

@@ -6746,6 +6759,9 @@ class LocalFunctionElementImpl extends ExecutableElementImpl
67466759
@override
67476760
MetadataImpl get metadata2 => metadata;
67486761

6762+
@override
6763+
String? get name3 => _wrappedElement.name2;
6764+
67496765
@override
67506766
TypeImpl get returnType => _wrappedElement.returnType;
67516767

@@ -6770,6 +6786,15 @@ class LocalFunctionElementImpl extends ExecutableElementImpl
67706786
@Deprecated('Use accept instead')
67716787
@override
67726788
T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
6789+
6790+
@override
6791+
String displayString2({
6792+
bool multiline = false,
6793+
bool preferTypeAlias = false,
6794+
}) => _wrappedElement.getDisplayString(
6795+
multiline: multiline,
6796+
preferTypeAlias: preferTypeAlias,
6797+
);
67736798
}
67746799

67756800
/// A concrete implementation of a [LocalFunctionFragment].
@@ -6798,9 +6823,8 @@ class LocalFunctionFragmentImpl extends FunctionFragmentImpl
67986823
}
67996824

68006825
class LocalVariableElementImpl extends PromotableElementImpl
6801-
with WrappedElementMixin, _NonTopLevelVariableOrParameter
6826+
with _NonTopLevelVariableOrParameter
68026827
implements LocalVariableElement {
6803-
@override
68046828
final LocalVariableFragmentImpl _wrappedElement;
68056829

68066830
@override
@@ -6840,6 +6864,9 @@ class LocalVariableElementImpl extends PromotableElementImpl
68406864
@override
68416865
bool get isStatic => _wrappedElement.isStatic;
68426866

6867+
@override
6868+
bool get isSynthetic => _wrappedElement.isSynthetic;
6869+
68436870
@override
68446871
ElementKind get kind => ElementKind.LOCAL_VARIABLE;
68456872

@@ -6857,9 +6884,8 @@ class LocalVariableElementImpl extends PromotableElementImpl
68576884
@override
68586885
MetadataImpl get metadata2 => metadata;
68596886

6860-
LocalVariableFragmentImpl get wrappedElement {
6861-
return _wrappedElement;
6862-
}
6887+
@override
6888+
String? get name3 => _wrappedElement.name2;
68636889

68646890
@override
68656891
FragmentImpl? get _enclosingFunction => _wrappedElement.enclosingElement3;
@@ -10147,25 +10173,6 @@ abstract class VariableFragmentImpl extends FragmentImpl
1014710173
}
1014810174
}
1014910175

10150-
mixin WrappedElementMixin implements ElementImpl {
10151-
@override
10152-
bool get isSynthetic => _wrappedElement.isSynthetic;
10153-
10154-
@override
10155-
String? get name3 => _wrappedElement.name2;
10156-
10157-
FragmentImpl get _wrappedElement;
10158-
10159-
@override
10160-
String displayString2({
10161-
bool multiline = false,
10162-
bool preferTypeAlias = false,
10163-
}) => _wrappedElement.getDisplayString(
10164-
multiline: multiline,
10165-
preferTypeAlias: preferTypeAlias,
10166-
);
10167-
}
10168-
1016910176
abstract class _ExistingFragmentImpl extends FragmentImpl
1017010177
with _HasLibraryMixin {
1017110178
_ExistingFragmentImpl({required super.nameOffset});

0 commit comments

Comments
 (0)