Skip to content

Commit bb71825

Browse files
pqCommit Queue
authored andcommitted
[element model] migrate non_covariant_type_parameter_position (and test)
Change-Id: I1d3ccd1e885a26ae6b0f5082cc4a67fee3e77fb1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401983 Commit-Queue: Phil Quitslund <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 60dd16b commit bb71825

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

pkg/analyzer/analyzer_use_new_elements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ lib/src/dart/element/least_greatest_closure.dart
3838
lib/src/dart/element/least_upper_bound.dart
3939
lib/src/dart/element/member.dart
4040
lib/src/dart/element/name_union.dart
41-
lib/src/dart/element/non_covariant_type_parameter_position.dart
4241
lib/src/dart/element/normalize.dart
4342
lib/src/dart/element/replace_top_bottom_visitor.dart
4443
lib/src/dart/element/replacement_visitor.dart
@@ -177,7 +176,6 @@ test/src/dart/element/inheritance_manager3_test.dart
177176
test/src/dart/element/least_greatest_closure_test.dart
178177
test/src/dart/element/least_upper_bound_helper_test.dart
179178
test/src/dart/element/name_union_test.dart
180-
test/src/dart/element/non_covariant_type_parameter_position_test.dart
181179
test/src/dart/element/normalize_type_test.dart
182180
test/src/dart/element/nullable_test.dart
183181
test/src/dart/element/runtime_type_equality_test.dart

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
import 'package:_fe_analyzer_shared/src/type_inference/type_analyzer_operations.dart'
66
show Variance;
7-
import 'package:analyzer/dart/element/element.dart';
7+
import 'package:analyzer/dart/element/element2.dart';
88
import 'package:analyzer/dart/element/type.dart';
99
import 'package:analyzer/dart/element/type_visitor.dart';
1010
import 'package:analyzer/src/dart/element/extensions.dart';
1111

1212
class NonCovariantTypeParameterPositionVisitor implements TypeVisitor<bool> {
13-
final List<TypeParameterElement> _typeParameters;
13+
final List<TypeParameterElement2> _typeParameters;
1414
Variance _variance;
1515

1616
NonCovariantTypeParameterPositionVisitor(
@@ -30,15 +30,15 @@ class NonCovariantTypeParameterPositionVisitor implements TypeVisitor<bool> {
3030
var oldVariance = _variance;
3131

3232
_variance = Variance.invariant;
33-
for (var typeParameter in type.typeFormals) {
33+
for (var typeParameter in type.typeParameters) {
3434
var bound = typeParameter.bound;
3535
if (bound != null && bound.accept(this)) {
3636
return true;
3737
}
3838
}
3939

4040
_variance = oldVariance.combine(Variance.contravariant);
41-
for (var formalParameter in type.parameters) {
41+
for (var formalParameter in type.formalParameters) {
4242
if (formalParameter.type.accept(this)) {
4343
return true;
4444
}
@@ -77,7 +77,7 @@ class NonCovariantTypeParameterPositionVisitor implements TypeVisitor<bool> {
7777
@override
7878
bool visitTypeParameterType(TypeParameterType type) {
7979
return _variance != Variance.covariant &&
80-
_typeParameters.contains(type.element);
80+
_typeParameters.contains(type.element3);
8181
}
8282

8383
@override

pkg/analyzer/lib/src/generated/error_verifier.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4806,7 +4806,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
48064806
var representationType = element.representation.type;
48074807

48084808
for (var typeParameterNode in typeParameters) {
4809-
var typeParameterElement = typeParameterNode.declaredElement!;
4809+
var typeParameterElement = typeParameterNode.declaredFragment!.element;
48104810
var nonCovariant = representationType.accept(
48114811
NonCovariantTypeParameterPositionVisitor(
48124812
[typeParameterElement],

pkg/analyzer/test/generated/elements_types_mixin.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ mixin ElementsTypesMixin {
464464
return parameter;
465465
}
466466

467-
ParameterElement positionalParameter({
467+
ParameterElementImpl positionalParameter({
468468
String? name,
469469
required DartType type,
470470
bool isCovariant = false,

pkg/analyzer/test/src/dart/element/non_covariant_type_parameter_position_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class NonCovariantTypeParameterPositionVisitorTest
166166
bool _compute(DartType type) {
167167
return type.accept(
168168
NonCovariantTypeParameterPositionVisitor(
169-
[T_element],
169+
[T_element.element],
170170
initialVariance: Variance.covariant,
171171
),
172172
);

0 commit comments

Comments
 (0)