dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Elements. Stop implementing VariableElementOrMember and ParameterElementMixin by members.

Browse Source 
The test changes are intentional, because `typeParameters2`
in `FormalParameterElementImpl` now returns elements.

Change-Id: Idd4696f6b69d4f4d84f7f5678d1476044512dfaf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/437700
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
This commit is contained in:
Konstantin Shcheglov
2025-06-30 10:06:30 -07:00
committed by Commit Queue
parent 1197f56d2c
commit 29698c70a3
8 changed files with 139 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/analyzer/lib/src/dart/element/display_string_builder.dart
+21 -4
View File
@@ -209,6 +209,20 @@ class ElementDisplayStringBuilder {
}
}
void writeFormalParameter2(FormalParameterElementMixin element) {
if (element.isRequiredPositional) {
_writeWithoutDelimiters2(element, forElement: true);
} else if (element.isOptionalPositional) {
_write('[');
_writeWithoutDelimiters2(element, forElement: true);
_write(']');
} else if (element.isNamed) {
_write('{');
_writeWithoutDelimiters2(element, forElement: true);
_write('}');
}
}
void writeFunctionType(FunctionTypeImpl type) {
if (_maybeWriteTypeAlias(type)) {
return;
@@ -219,10 +233,7 @@ class ElementDisplayStringBuilder {
_writeType(type.returnType);
_write(' Function');
_writeTypeParameters2(type.typeParameters);
_writeFormalParameters(
type.parameters.map((e) => e.asElement).toList(),
forElement: false,
);
_writeFormalParameters2(type.parameters, forElement: false);
_writeNullability(type.nullabilitySuffix);
}
@@ -425,6 +436,12 @@ class ElementDisplayStringBuilder {
_write(element.displayName);
}
void writeVariableElement2(VariableElement2OrMember element) {
_writeType(element.type);
_write(' ');
_write(element.displayName);
}
void writeVoidType() {
_write('void');
}
pkg/analyzer/lib/src/dart/element/element.dart
+2 -1
View File
@@ -3111,7 +3111,8 @@ class FormalParameterElementImpl extends PromotableElementImpl
@override
// TODO(augmentations): Implement the merge of formal parameters.
List<TypeParameterElement> get typeParameters2 => const [];
List<TypeParameterElement> get typeParameters2 =>
firstFragment.typeParameters.map((fragment) => fragment.element).toList();
@override
TypeImpl get typeShared => type;
pkg/analyzer/lib/src/dart/element/member.dart
+29 -41
View File
@@ -926,9 +926,8 @@ class MethodMember extends ExecutableMember implements MethodElement2OrMember {
/// A parameter element defined in a parameterized type where the values of the
/// type parameters are known.
class ParameterMember extends VariableMember
with ParameterElementMixin, FormalParameterElementMixin {
@override
class ParameterMember extends VariableMember with FormalParameterElementMixin {
// TODO(scheglov): replace with TypeParameterElementImpl(s)
final List<TypeParameterFragmentImpl> typeParameters;
factory ParameterMember({
@@ -1012,6 +1011,30 @@ class ParameterMember extends VariableMember
@override
bool get isInitializingFormal => declaration.isInitializingFormal;
@override
bool get isNamed => baseElement.isNamed;
@override
bool get isOptional => baseElement.isOptional;
@override
bool get isOptionalNamed => baseElement.isOptionalNamed;
@override
bool get isOptionalPositional => baseElement.isOptionalPositional;
@override
bool get isPositional => baseElement.isPositional;
@override
bool get isRequired => baseElement.isRequired;
@override
bool get isRequiredNamed => baseElement.isRequiredNamed;
@override
bool get isRequiredPositional => baseElement.isRequiredPositional;
@override
bool get isSuperFormal => declaration.isSuperFormal;
@@ -1051,15 +1074,6 @@ class ParameterMember extends VariableMember
return declaration.parameterKind;
}
@override
List<ParameterElementMixin> get parameters {
var type = this.type;
if (type is FunctionTypeImpl) {
return type.parameters.map((element) => element.asElement).toList();
}
return const <ParameterElementMixin>[];
}
@override
Source? get source => _declaration.source;
@@ -1083,7 +1097,7 @@ class ParameterMember extends VariableMember
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeFormalParameter(this);
builder.writeFormalParameter2(this);
}
@override
@@ -1121,32 +1135,6 @@ class ParameterMember extends VariableMember
_element2.visitChildren2(visitor);
}
static ParameterElementMixin from(
ParameterElementMixin element,
MapSubstitution substitution,
) {
FormalParameterFragmentImpl declaration;
var combined = substitution;
if (element is ParameterMember) {
var member = element;
declaration = member.declaration;
var map = <TypeParameterElement, DartType>{
for (var MapEntry(:key, :value) in member.substitution.map.entries)
key: substitution.substituteType(value),
};
combined = Substitution.fromMap2(map);
} else {
declaration = element as FormalParameterFragmentImpl;
}
if (combined.map.isEmpty) {
return element;
}
return ParameterMember(declaration: declaration, substitution: combined);
}
static FormalParameterElementMixin from2(
FormalParameterElementMixin element,
MapSubstitution substitution,
@@ -1398,7 +1386,7 @@ class SuperFormalParameterMember extends ParameterMember
/// A variable element defined in a parameterized type where the values of the
/// type parameters are known.
abstract class VariableMember extends Member
implements VariableElementOrMember {
implements VariableElement2OrMember {
TypeImpl? _type;
/// Initialize a newly created element to represent a variable, based on the
@@ -1437,7 +1425,7 @@ abstract class VariableMember extends Member
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeVariableElement(this);
builder.writeVariableElement2(this);
}
}
pkg/analyzer/lib/src/summary2/bundle_writer.dart
+62 -4
View File
@@ -991,6 +991,10 @@ class ResolutionSink extends _SummaryDataWriter {
}
}
void _writeElementName(Element element) {
_writeOptionalStringReference(element.name3);
}
void _writeFormalParameters(
List<ParameterElementMixin> parameters, {
required bool withAnnotations,
@@ -1014,6 +1018,29 @@ class ResolutionSink extends _SummaryDataWriter {
}
}
void _writeFormalParameters2(
List<FormalParameterElementMixin> parameters, {
required bool withAnnotations,
}) {
writeUInt30(parameters.length);
for (var parameter in parameters) {
_writeFormalParameterKind2(parameter);
writeBool(parameter.hasImplicitType);
writeBool(parameter.isInitializingFormal);
_writeTypeParameters2(parameter.typeParameters2.cast(), () {
writeType(parameter.type);
_writeElementName(parameter);
_writeFormalParameters2(
parameter.formalParameters.cast(),
withAnnotations: withAnnotations,
);
}, withAnnotations: withAnnotations);
if (withAnnotations) {
_writeMetadata(parameter.metadata as MetadataImpl);
}
}
}
void _writeFragmentName(Fragment fragment) {
_writeOptionalStringReference(fragment.name2);
}
@@ -1025,10 +1052,7 @@ class ResolutionSink extends _SummaryDataWriter {
_writeTypeParameters(type.typeFormals, () {
writeType(type.returnType);
_writeFormalParameters(
type.parameters.map((e) => e.asElement).toList(),
withAnnotations: false,
);
_writeFormalParameters2(type.formalParameters, withAnnotations: false);
}, withAnnotations: false);
_writeNullabilitySuffix(type.nullabilitySuffix);
}
@@ -1115,6 +1139,26 @@ class ResolutionSink extends _SummaryDataWriter {
});
}
void _writeTypeParameters2(
List<TypeParameterElementImpl> typeParameters,
void Function() f, {
required bool withAnnotations,
}) {
localElements.withElements(typeParameters, () {
writeUInt30(typeParameters.length);
for (var typeParameter in typeParameters) {
_writeElementName(typeParameter);
}
for (var typeParameter in typeParameters) {
writeType(typeParameter.bound);
if (withAnnotations) {
_writeMetadata(typeParameter.metadata);
}
}
f();
});
}
static List<DartType> _enclosingClassTypeArguments(
Element declaration,
Map<TypeParameterElement, DartType> substitution,
@@ -1320,6 +1364,20 @@ class _SummaryDataWriter extends BufferedSink {
}
}
void _writeFormalParameterKind2(FormalParameterElementMixin p) {
if (p.isRequiredPositional) {
writeByte(Tag.ParameterKindRequiredPositional);
} else if (p.isOptionalPositional) {
writeByte(Tag.ParameterKindOptionalPositional);
} else if (p.isRequiredNamed) {
writeByte(Tag.ParameterKindRequiredNamed);
} else if (p.isOptionalNamed) {
writeByte(Tag.ParameterKindOptionalNamed);
} else {
throw StateError('Unexpected parameter kind: $p');
}
}
void _writeOptionalStringReference(String? value) {
if (value != null) {
writeBool(true);
pkg/analyzer/lib/src/utilities/extensions/element.dart
-10
View File
@@ -274,16 +274,6 @@ extension FormalParameterElementImplExtension on FormalParameterElementImpl {
}
}
extension FormalParameterElementMixinExtension on FormalParameterElementMixin {
ParameterElementMixin get asElement {
return switch (this) {
FormalParameterElementImpl(:var firstFragment) => firstFragment,
ParameterMember member => member,
_ => throw UnsupportedError('Unsupported type: $runtimeType'),
};
}
}
extension GetterElementImplExtension on GetterElementImpl {
PropertyAccessorFragmentImpl get asElement {
return lastFragment;
pkg/analyzer/test/src/summary/elements/class_test.dart
+11 -2
View File
@@ -728,9 +728,14 @@ library
requiredPositional final f
firstFragment: #F4
type: List<U> Function<T, U>(T)
typeParameters
#E0 T
firstFragment: #F8
#E1 U
firstFragment: #F9
formalParameters
requiredPositional t
firstFragment: #F8
firstFragment: #F10
type: T
getters
synthetic f
@@ -2917,9 +2922,13 @@ library
requiredPositional final a
firstFragment: #F6
type: int Function<T extends num>(T)?
typeParameters
#E0 T
firstFragment: #F7
bound: num
formalParameters
requiredPositional d
firstFragment: #F7
firstFragment: #F8
type: T
superConstructor: <testLibrary>::@class::A::@constructor::new
''');
pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart
+6 -1
View File
@@ -559,9 +559,14 @@ library
requiredPositional a
firstFragment: #F2
type: T Function<T, U>(U)
typeParameters
#E0 T
firstFragment: #F3
#E1 U
firstFragment: #F4
formalParameters
requiredPositional u
firstFragment: #F3
firstFragment: #F5
type: U
returnType: void
''');
pkg/analyzer/test/src/summary/elements/offsets_test.dart
+8 -2
View File
@@ -3037,9 +3037,12 @@ library
requiredPositional f
firstFragment: #F2
type: void Function<U>(int)
typeParameters
#E0 U
firstFragment: #F3
formalParameters
requiredPositional a
firstFragment: #F3
firstFragment: #F4
type: int
returnType: void
''');
@@ -3069,9 +3072,12 @@ library
requiredNamed f
firstFragment: #F2
type: void Function<U>(int)
typeParameters
#E0 U
firstFragment: #F3
formalParameters
requiredPositional a
firstFragment: #F3
firstFragment: #F4
type: int
returnType: void
''');