Skip to content

Commit 69aba23

Browse files
scheglovcommit-bot@chromium.org
scheglov
authored and
[email protected]
committed
Move TypeSystemImpl to src/dart/element/type_system.dart
[email protected] Change-Id: I0d9acad041c1038f6f2be6c09855488287ba5e97 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153320 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent a677c24 commit 69aba23

File tree

87 files changed

+1596
-1588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1596
-1588
lines changed

‎pkg/analyzer/lib/dart/analysis/declared_variables.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:analyzer/dart/constant/value.dart';
66
import 'package:analyzer/dart/element/type_provider.dart';
77
import 'package:analyzer/src/dart/constant/from_environment_evaluator.dart';
8-
import 'package:analyzer/src/generated/type_system.dart';
8+
import 'package:analyzer/src/dart/element/type_system.dart';
99

1010
/// An object used to provide access to the values of variables that have been
1111
/// defined on the command line using the `-D` option.

‎pkg/analyzer/lib/dart/analysis/results.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'package:analyzer/dart/ast/ast.dart';
77
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/dart/element/type_provider.dart';
99
import 'package:analyzer/error/error.dart';
10+
import 'package:analyzer/src/dart/element/type_system.dart';
1011
import 'package:analyzer/src/generated/source.dart';
11-
import 'package:analyzer/src/generated/type_system.dart';
1212

1313
/// The result of performing some kind of analysis on a single file. Every
1414
/// result that implements this interface will also implement a sub-interface.

‎pkg/analyzer/lib/dart/analysis/session.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import 'package:analyzer/dart/element/element.dart';
1212
import 'package:analyzer/dart/element/type_provider.dart';
1313
import 'package:analyzer/exception/exception.dart';
1414
import 'package:analyzer/file_system/file_system.dart';
15+
import 'package:analyzer/src/dart/element/type_system.dart';
1516
import 'package:analyzer/src/generated/source.dart';
16-
import 'package:analyzer/src/generated/type_system.dart';
1717

1818
/// A consistent view of the results of analyzing one or more files.
1919
///

‎pkg/analyzer/lib/src/context/context.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import 'package:analyzer/dart/element/type_provider.dart';
66
import 'package:analyzer/src/dart/analysis/session.dart';
77
import 'package:analyzer/src/dart/element/type_provider.dart';
8+
import 'package:analyzer/src/dart/element/type_system.dart';
89
import 'package:analyzer/src/generated/constant.dart';
910
import 'package:analyzer/src/generated/engine.dart';
1011
import 'package:analyzer/src/generated/source.dart';
11-
import 'package:analyzer/src/generated/type_system.dart' show TypeSystemImpl;
1212
import 'package:meta/meta.dart';
1313

1414
/// An [AnalysisContext] in which analysis can be performed.

‎pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import 'package:analyzer/src/dart/constant/utilities.dart';
2121
import 'package:analyzer/src/dart/element/element.dart';
2222
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
2323
import 'package:analyzer/src/dart/element/type_provider.dart';
24+
import 'package:analyzer/src/dart/element/type_system.dart';
2425
import 'package:analyzer/src/dart/error/syntactic_errors.dart';
2526
import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
2627
import 'package:analyzer/src/dart/resolver/legacy_type_asserter.dart';
@@ -42,7 +43,6 @@ import 'package:analyzer/src/generated/error_verifier.dart';
4243
import 'package:analyzer/src/generated/ffi_verifier.dart';
4344
import 'package:analyzer/src/generated/resolver.dart';
4445
import 'package:analyzer/src/generated/source.dart';
45-
import 'package:analyzer/src/generated/type_system.dart';
4646
import 'package:analyzer/src/hint/sdk_constraint_verifier.dart';
4747
import 'package:analyzer/src/ignore_comments/ignore_info.dart';
4848
import 'package:analyzer/src/lint/linter.dart';

‎pkg/analyzer/lib/src/dart/analysis/results.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:analyzer/dart/element/element.dart';
1010
import 'package:analyzer/dart/element/type_provider.dart';
1111
import 'package:analyzer/error/error.dart';
1212
import 'package:analyzer/source/line_info.dart';
13-
import 'package:analyzer/src/generated/type_system.dart';
13+
import 'package:analyzer/src/dart/element/type_system.dart';
1414

1515
abstract class AnalysisResultImpl implements AnalysisResult {
1616
@override

‎pkg/analyzer/lib/src/dart/analysis/session.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import 'package:analyzer/src/dart/analysis/uri_converter.dart';
1717
import 'package:analyzer/src/dart/element/class_hierarchy.dart';
1818
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
1919
import 'package:analyzer/src/dart/element/type_provider.dart';
20+
import 'package:analyzer/src/dart/element/type_system.dart';
2021
import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
2122
import 'package:analyzer/src/generated/source.dart';
22-
import 'package:analyzer/src/generated/type_system.dart';
2323
import 'package:meta/meta.dart';
2424

2525
/// A concrete implementation of an analysis session.

‎pkg/analyzer/lib/src/dart/constant/compute.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:analyzer/dart/element/type_provider.dart';
77
import 'package:analyzer/src/dart/analysis/experiments.dart';
88
import 'package:analyzer/src/dart/constant/evaluation.dart';
99
import 'package:analyzer/src/dart/element/element.dart';
10-
import 'package:analyzer/src/generated/type_system.dart' show TypeSystemImpl;
10+
import 'package:analyzer/src/dart/element/type_system.dart';
1111
import 'package:analyzer/src/summary/link.dart' as graph
1212
show DependencyWalker, Node;
1313

‎pkg/analyzer/lib/src/dart/constant/constant_verifier.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import 'package:analyzer/src/dart/constant/evaluation.dart';
1818
import 'package:analyzer/src/dart/constant/potentially_constant.dart';
1919
import 'package:analyzer/src/dart/constant/value.dart';
2020
import 'package:analyzer/src/dart/element/element.dart';
21+
import 'package:analyzer/src/dart/element/type_system.dart';
2122
import 'package:analyzer/src/diagnostic/diagnostic_factory.dart';
2223
import 'package:analyzer/src/error/codes.dart';
2324
import 'package:analyzer/src/generated/engine.dart';
24-
import 'package:analyzer/src/generated/type_system.dart';
2525

2626
/// Instances of the class `ConstantVerifier` traverse an AST structure looking
2727
/// for additional errors and warnings not covered by the parser and resolver.

‎pkg/analyzer/lib/src/dart/constant/evaluation.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import 'package:analyzer/src/dart/constant/value.dart';
2626
import 'package:analyzer/src/dart/element/element.dart';
2727
import 'package:analyzer/src/dart/element/member.dart';
2828
import 'package:analyzer/src/dart/element/type_algebra.dart';
29+
import 'package:analyzer/src/dart/element/type_system.dart' show TypeSystemImpl;
2930
import 'package:analyzer/src/error/codes.dart';
3031
import 'package:analyzer/src/generated/constant.dart';
3132
import 'package:analyzer/src/generated/engine.dart';
3233
import 'package:analyzer/src/generated/engine.dart'
3334
show AnalysisEngine, RecordingErrorListener;
34-
import 'package:analyzer/src/generated/type_system.dart' show TypeSystemImpl;
3535
import 'package:analyzer/src/task/api/model.dart';
3636

3737
/// Helper class encapsulating the methods for evaluating constants and

‎pkg/analyzer/lib/src/dart/constant/from_environment_evaluator.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:analyzer/dart/analysis/declared_variables.dart';
66
import 'package:analyzer/dart/constant/value.dart';
77
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/src/dart/constant/value.dart';
9-
import 'package:analyzer/src/generated/type_system.dart';
9+
import 'package:analyzer/src/dart/element/type_system.dart';
1010

1111
class FromEnvironmentEvaluator {
1212
/// Parameter to "fromEnvironment" methods that denotes the default value.

‎pkg/analyzer/lib/src/dart/constant/value.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import 'package:analyzer/dart/element/type.dart';
1111
import 'package:analyzer/dart/element/type_provider.dart';
1212
import 'package:analyzer/error/error.dart';
1313
import 'package:analyzer/src/dart/constant/has_type_parameter_reference.dart';
14+
import 'package:analyzer/src/dart/element/type_system.dart';
1415
import 'package:analyzer/src/error/codes.dart';
15-
import 'package:analyzer/src/generated/type_system.dart';
1616
import 'package:analyzer/src/generated/utilities_general.dart';
1717

1818
/// The state of an object representing a boolean value.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:analyzer/dart/element/element.dart';
66
import 'package:analyzer/dart/element/type.dart';
77
import 'package:analyzer/src/dart/element/element.dart';
88
import 'package:analyzer/src/dart/element/type_algebra.dart';
9-
import 'package:analyzer/src/generated/type_system.dart';
9+
import 'package:analyzer/src/dart/element/type_system.dart';
1010
import 'package:meta/meta.dart';
1111

1212
class ClassHierarchy {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import 'package:analyzer/src/dart/element/nullability_eliminator.dart';
2323
import 'package:analyzer/src/dart/element/type.dart';
2424
import 'package:analyzer/src/dart/element/type_algebra.dart';
2525
import 'package:analyzer/src/dart/element/type_provider.dart';
26+
import 'package:analyzer/src/dart/element/type_system.dart';
2627
import 'package:analyzer/src/dart/resolver/scope.dart';
2728
import 'package:analyzer/src/dart/resolver/variance.dart';
2829
import 'package:analyzer/src/generated/constant.dart' show EvaluationResultImpl;
@@ -32,7 +33,6 @@ import 'package:analyzer/src/generated/engine.dart'
3233
import 'package:analyzer/src/generated/java_engine.dart';
3334
import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
3435
import 'package:analyzer/src/generated/source.dart';
35-
import 'package:analyzer/src/generated/type_system.dart';
3636
import 'package:analyzer/src/generated/utilities_collection.dart';
3737
import 'package:analyzer/src/generated/utilities_dart.dart';
3838
import 'package:analyzer/src/generated/utilities_general.dart';

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import 'package:analyzer/src/dart/element/type_algebra.dart';
1616
import 'package:analyzer/src/dart/element/type_constraint_gatherer.dart';
1717
import 'package:analyzer/src/dart/element/type_demotion.dart';
1818
import 'package:analyzer/src/dart/element/type_schema.dart';
19+
import 'package:analyzer/src/dart/element/type_system.dart';
1920
import 'package:analyzer/src/error/codes.dart' show HintCode, StrongModeCode;
20-
import 'package:analyzer/src/generated/type_system.dart';
2121
import 'package:meta/meta.dart';
2222

2323
/// Tracks upper and lower type bounds for a set of type parameters.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:analyzer/src/dart/element/extensions.dart';
99
import 'package:analyzer/src/dart/element/type.dart';
1010
import 'package:analyzer/src/dart/element/type_provider.dart';
1111
import 'package:analyzer/src/dart/element/type_schema.dart';
12-
import 'package:analyzer/src/generated/type_system.dart';
12+
import 'package:analyzer/src/dart/element/type_system.dart';
1313
import 'package:analyzer/src/generated/utilities_dart.dart';
1414

1515
class GreatestLowerBoundHelper {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'package:analyzer/dart/element/type.dart';
77
import 'package:analyzer/src/dart/element/element.dart';
88
import 'package:analyzer/src/dart/element/member.dart';
99
import 'package:analyzer/src/dart/element/type_algebra.dart';
10+
import 'package:analyzer/src/dart/element/type_system.dart';
1011
import 'package:analyzer/src/error/correct_override.dart';
11-
import 'package:analyzer/src/generated/type_system.dart' show TypeSystemImpl;
1212
import 'package:analyzer/src/generated/utilities_general.dart';
1313
import 'package:meta/meta.dart';
1414

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import 'package:analyzer/src/dart/element/extensions.dart';
1010
import 'package:analyzer/src/dart/element/type.dart';
1111
import 'package:analyzer/src/dart/element/type_algebra.dart';
1212
import 'package:analyzer/src/dart/element/type_schema.dart';
13+
import 'package:analyzer/src/dart/element/type_system.dart';
1314
import 'package:analyzer/src/dart/resolver/variance.dart';
14-
import 'package:analyzer/src/generated/type_system.dart';
1515
import 'package:analyzer/src/generated/utilities_dart.dart';
1616
import 'package:meta/meta.dart';
1717

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:analyzer/src/dart/element/extensions.dart';
1010
import 'package:analyzer/src/dart/element/type.dart';
1111
import 'package:analyzer/src/dart/element/type_algebra.dart';
1212
import 'package:analyzer/src/dart/element/type_provider.dart';
13-
import 'package:analyzer/src/generated/type_system.dart';
13+
import 'package:analyzer/src/dart/element/type_system.dart';
1414

1515
/// Helper for computing canonical presentation of types.
1616
///

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import 'package:analyzer/dart/element/type.dart';
88
import 'package:analyzer/src/dart/element/element.dart';
99
import 'package:analyzer/src/dart/element/type.dart';
1010
import 'package:analyzer/src/dart/element/type_algebra.dart';
11+
import 'package:analyzer/src/dart/element/type_system.dart';
1112
import 'package:analyzer/src/dart/element/type_visitor.dart';
12-
import 'package:analyzer/src/generated/type_system.dart';
1313

1414
class RuntimeTypeEqualityHelper {
1515
final TypeSystemImpl _typeSystem;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import 'package:analyzer/src/dart/element/type.dart';
1111
import 'package:analyzer/src/dart/element/type_algebra.dart';
1212
import 'package:analyzer/src/dart/element/type_provider.dart';
1313
import 'package:analyzer/src/dart/element/type_schema.dart';
14+
import 'package:analyzer/src/dart/element/type_system.dart';
1415
import 'package:analyzer/src/dart/resolver/variance.dart';
15-
import 'package:analyzer/src/generated/type_system.dart';
1616
import 'package:analyzer/src/generated/utilities_dart.dart';
1717

1818
/// Helper for checking the subtype relation.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:analyzer/src/dart/element/element.dart';
99
import 'package:analyzer/src/dart/element/extensions.dart';
1010
import 'package:analyzer/src/dart/element/type.dart';
1111
import 'package:analyzer/src/dart/element/type_algebra.dart';
12-
import 'package:analyzer/src/generated/type_system.dart';
12+
import 'package:analyzer/src/dart/element/type_system.dart';
1313
import 'package:analyzer/src/generated/utilities_dart.dart';
1414

1515
class TopMergeHelper {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import 'package:analyzer/src/dart/element/extensions.dart';
1717
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
1818
import 'package:analyzer/src/dart/element/member.dart';
1919
import 'package:analyzer/src/dart/element/type_algebra.dart';
20+
import 'package:analyzer/src/dart/element/type_system.dart';
2021
import 'package:analyzer/src/generated/element_type_provider.dart';
2122
import 'package:analyzer/src/generated/engine.dart' show AnalysisEngine;
22-
import 'package:analyzer/src/generated/type_system.dart';
2323
import 'package:analyzer/src/generated/utilities_dart.dart';
2424
import 'package:meta/meta.dart';
2525

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:analyzer/src/dart/element/element.dart';
99
import 'package:analyzer/src/dart/element/type.dart';
1010
import 'package:analyzer/src/dart/element/type_algebra.dart';
1111
import 'package:analyzer/src/dart/element/type_schema.dart';
12-
import 'package:analyzer/src/generated/type_system.dart';
12+
import 'package:analyzer/src/dart/element/type_system.dart';
1313
import 'package:meta/meta.dart';
1414

1515
/// A constraint on the type [parameter] that we're inferring.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'package:analyzer/dart/element/nullability_suffix.dart';
77
import 'package:analyzer/dart/element/type.dart';
88
import 'package:analyzer/src/dart/element/replacement_visitor.dart';
99
import 'package:analyzer/src/dart/element/type.dart';
10+
import 'package:analyzer/src/dart/element/type_system.dart';
1011
import 'package:analyzer/src/dart/element/type_visitor.dart';
11-
import 'package:analyzer/src/generated/type_system.dart';
1212

1313
/// Returns [type] in which all promoted type variables have been replace with
1414
/// their unpromoted equivalents, and, if [library] is non-nullable by default,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:analyzer/dart/element/type.dart';
88
import 'package:analyzer/dart/element/type_provider.dart';
99
import 'package:analyzer/src/dart/constant/value.dart';
1010
import 'package:analyzer/src/dart/element/type.dart';
11-
import 'package:analyzer/src/generated/type_system.dart';
11+
import 'package:analyzer/src/dart/element/type_system.dart';
1212
import 'package:meta/meta.dart';
1313

1414
/// Provide common functionality shared by the various TypeProvider

0 commit comments

Comments
 (0)