Legacy. Remove star types from shared FactorTypeTestMixin.
Change-Id: Ibb287b86aed21b296ddc646ce0db7f83c2c947d7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/355580
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/_fe_analyzer_shared/lib/src/flow_analysis/factory_type_test_helper.dart b/pkg/_fe_analyzer_shared/lib/src/flow_analysis/factory_type_test_helper.dart
index 73ae5f5..df10810 100644
--- a/pkg/_fe_analyzer_shared/lib/src/flow_analysis/factory_type_test_helper.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/flow_analysis/factory_type_test_helper.dart
@@ -9,16 +9,12 @@
Type get dynamicType;
Type get intNone;
Type get intQuestion;
- Type get intStar;
Type get numNone;
Type get numQuestion;
- Type get numStar;
Type get objectNone;
Type get objectQuestion;
- Type get objectStar;
Type get stringNone;
Type get stringQuestion;
- Type get stringStar;
Type get nullNone;
Type get voidType;
@@ -34,8 +30,6 @@
check(futureOrNone(intQuestion), futureNone(intNone), 'FutureOr<int?>');
check(futureOrNone(intQuestion), intQuestion, 'Future<int?>');
check(futureOrNone(intQuestion), futureNone(intQuestion), 'int?');
- check(futureOrNone(intQuestion), intStar, 'Future<int?>');
- check(futureOrNone(intQuestion), futureNone(intStar), 'int?');
check(futureOrNone(intNone), numNone, 'Future<int>');
check(futureOrNone(intNone), futureNone(numNone), 'int');
@@ -44,61 +38,38 @@
void test_object() {
check(objectNone, objectNone, 'Never');
check(objectNone, objectQuestion, 'Never');
- check(objectNone, objectStar, 'Never');
check(objectNone, intNone, 'Object');
check(objectNone, intQuestion, 'Object');
- check(objectNone, intStar, 'Object');
check(objectQuestion, objectNone, 'Never?');
check(objectQuestion, objectQuestion, 'Never');
- check(objectQuestion, objectStar, 'Never');
check(objectQuestion, intNone, 'Object?');
check(objectQuestion, intQuestion, 'Object');
- check(objectQuestion, intStar, 'Object');
}
test_subtype() {
check(intNone, intNone, 'Never');
check(intNone, intQuestion, 'Never');
- check(intNone, intStar, 'Never');
check(intQuestion, intNone, 'Never?');
check(intQuestion, intQuestion, 'Never');
- check(intQuestion, intStar, 'Never');
-
- check(intStar, intNone, 'Never');
- check(intStar, intQuestion, 'Never');
- check(intStar, intStar, 'Never');
check(intNone, numNone, 'Never');
check(intNone, numQuestion, 'Never');
- check(intNone, numStar, 'Never');
check(intQuestion, numNone, 'Never?');
check(intQuestion, numQuestion, 'Never');
- check(intQuestion, numStar, 'Never');
-
- check(intStar, numNone, 'Never');
- check(intStar, numQuestion, 'Never');
- check(intStar, numStar, 'Never');
check(intNone, nullNone, 'int');
check(intQuestion, nullNone, 'int');
- check(intStar, nullNone, 'int');
check(intNone, stringNone, 'int');
check(intQuestion, stringNone, 'int?');
- check(intStar, stringNone, 'int*');
check(intNone, stringQuestion, 'int');
check(intQuestion, stringQuestion, 'int');
- check(intStar, stringQuestion, 'int');
-
- check(intNone, stringStar, 'int');
- check(intQuestion, stringStar, 'int');
- check(intStar, stringStar, 'int');
}
void test_void() {
diff --git a/pkg/analyzer/test/src/dart/element/factor_type_test.dart b/pkg/analyzer/test/src/dart/element/factor_type_test.dart
index 0977eef..9c879bb 100644
--- a/pkg/analyzer/test/src/dart/element/factor_type_test.dart
+++ b/pkg/analyzer/test/src/dart/element/factor_type_test.dart
@@ -3,8 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:_fe_analyzer_shared/src/flow_analysis/factory_type_test_helper.dart';
-import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/nullability_suffix.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/dart/element/type_provider.dart';
import 'package:analyzer/src/dart/element/type.dart';
@@ -29,30 +27,6 @@
late final TypeSystemImpl typeSystem;
@override
- InterfaceType get intStar {
- var element = typeProvider.intType.element;
- return interfaceTypeStar(element);
- }
-
- @override
- InterfaceType get numStar {
- var element = typeProvider.numType.element;
- return interfaceTypeStar(element);
- }
-
- @override
- InterfaceType get objectStar {
- var element = typeProvider.objectType.element;
- return interfaceTypeStar(element);
- }
-
- @override
- InterfaceType get stringStar {
- var element = typeProvider.stringType.element;
- return interfaceTypeStar(element);
- }
-
- @override
DartType get voidType => typeProvider.voidType;
@override
@@ -66,16 +40,6 @@
return typeSystem.factor(T, S);
}
- InterfaceType interfaceTypeStar(
- InterfaceElement element, {
- List<DartType> typeArguments = const [],
- }) {
- return element.instantiate(
- typeArguments: typeArguments,
- nullabilitySuffix: NullabilitySuffix.star,
- );
- }
-
void setUp() {
var analysisContext = TestAnalysisContext();
typeProvider = analysisContext.typeProvider;
diff --git a/pkg/front_end/test/fasta/type_inference/factor_type_test.dart b/pkg/front_end/test/fasta/type_inference/factor_type_test.dart
index 98e338a..9b4a373 100644
--- a/pkg/front_end/test/fasta/type_inference/factor_type_test.dart
+++ b/pkg/front_end/test/fasta/type_inference/factor_type_test.dart
@@ -60,9 +60,6 @@
DartType get intQuestion => coreTypes.intNullableRawType;
@override
- DartType get intStar => coreTypes.intLegacyRawType;
-
- @override
DartType get nullNone => const NullType();
@override
@@ -72,27 +69,18 @@
DartType get numQuestion => coreTypes.numNullableRawType;
@override
- DartType get numStar => coreTypes.numLegacyRawType;
-
- @override
DartType get objectNone => coreTypes.objectNonNullableRawType;
@override
DartType get objectQuestion => coreTypes.objectNullableRawType;
@override
- DartType get objectStar => coreTypes.objectLegacyRawType;
-
- @override
DartType get stringNone => coreTypes.stringNonNullableRawType;
@override
DartType get stringQuestion => coreTypes.stringNullableRawType;
@override
- DartType get stringStar => coreTypes.stringLegacyRawType;
-
- @override
DartType get voidType => const VoidType();
@override
