Skip to content

Commit beef6d6

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Use FormalParameterElementImpl instead of ParameterElementMixin in GenericInferrer.
Change-Id: Ie7cae1eb4c2a5ee81833ac077ce3e14feca52a9a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/437884 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent d0ee09b commit beef6d6

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class GenericInferrer {
179179
/// [argumentTypes].
180180
void constrainArguments({
181181
InterfaceFragmentImpl? genericClass,
182-
required List<ParameterElementMixin> parameters,
182+
required List<FormalParameterElementImpl> parameters,
183183
required List<TypeImpl> argumentTypes,
184184
required AstNodeImpl? nodeForTesting,
185185
}) {
@@ -189,7 +189,7 @@ class GenericInferrer {
189189
constrainArgument(
190190
argumentTypes[i],
191191
parameters[i].type,
192-
parameters[i].name2 ?? '',
192+
parameters[i].name3 ?? '',
193193
genericClass: genericClass,
194194
nodeForTesting: nodeForTesting,
195195
);

pkg/analyzer/lib/src/dart/resolver/typed_literal_resolver.dart

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -512,15 +512,12 @@ class TypedLiteralResolver {
512512
// Also use upwards information to infer the type.
513513
List<TypeImpl> elementTypes =
514514
node.elements.map(_computeElementType).toList();
515-
var syntheticParameter = FormalParameterFragmentImpl.synthetic(
515+
var syntheticParameter = FormalParameterElementImpl.synthetic(
516516
'element',
517517
genericElementType,
518518
ParameterKind.POSITIONAL,
519519
);
520-
List<ParameterElementMixin> parameters = List.filled(
521-
elementTypes.length,
522-
syntheticParameter,
523-
);
520+
var parameters = List.filled(elementTypes.length, syntheticParameter);
524521
if (_strictInference &&
525522
parameters.isEmpty &&
526523
contextType is UnknownInferredType) {
@@ -835,18 +832,18 @@ class TypedLiteralResolver {
835832
nullabilitySuffix: NullabilitySuffix.none,
836833
);
837834

838-
var parameters = <ParameterElementMixin>[];
835+
var parameters = <FormalParameterElementImpl>[];
839836
var argumentTypes = <TypeImpl>[];
840837
for (var i = 0; i < inferredTypes.length; i++) {
841838
parameters.add(
842-
FormalParameterFragmentImpl.synthetic(
839+
FormalParameterElementImpl.synthetic(
843840
'key',
844841
genericKeyType,
845842
ParameterKind.POSITIONAL,
846843
),
847844
);
848845
parameters.add(
849-
FormalParameterFragmentImpl.synthetic(
846+
FormalParameterElementImpl.synthetic(
850847
'value',
851848
genericValueType,
852849
ParameterKind.POSITIONAL,
@@ -894,11 +891,11 @@ class TypedLiteralResolver {
894891
nullabilitySuffix: NullabilitySuffix.none,
895892
);
896893

897-
var parameters = <ParameterElementMixin>[];
894+
var parameters = <FormalParameterElementImpl>[];
898895
var argumentTypes = <TypeImpl>[];
899896
for (var i = 0; i < inferredTypes.length; i++) {
900897
parameters.add(
901-
FormalParameterFragmentImpl.synthetic(
898+
FormalParameterElementImpl.synthetic(
902899
'element',
903900
genericElementType,
904901
ParameterKind.POSITIONAL,

0 commit comments

Comments
 (0)