diff --git a/pkg/analyzer/analyzer_use_new_elements.txt b/pkg/analyzer/analyzer_use_new_elements.txt index adceed9d251..48ad03d0bda 100644 --- a/pkg/analyzer/analyzer_use_new_elements.txt +++ b/pkg/analyzer/analyzer_use_new_elements.txt @@ -137,6 +137,7 @@ lib/src/summary2/element_builder.dart lib/src/summary2/extension_type.dart lib/src/summary2/function_type_builder.dart lib/src/summary2/informative_data.dart +lib/src/summary2/instance_member_inferrer.dart lib/src/summary2/library_builder.dart lib/src/summary2/link.dart lib/src/summary2/linked_element_factory.dart @@ -157,7 +158,6 @@ lib/src/summary2/top_level_inference.dart lib/src/summary2/type_alias.dart lib/src/summary2/types_builder.dart lib/src/summary2/variance_builder.dart -lib/src/task/strong_mode.dart lib/src/test_utilities/find_element.dart lib/src/test_utilities/find_node.dart lib/src/test_utilities/mock_sdk_elements.dart diff --git a/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart b/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart index 2c7b8350b14..b2372df58ab 100644 --- a/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart +++ b/pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart @@ -15,7 +15,7 @@ // ignore_for_file: flutter_style_todos /// @docImport 'package:analyzer/src/dart/error/syntactic_errors.g.dart'; -/// @docImport 'package:analyzer/src/task/inference_error.dart'; +/// @docImport 'package:analyzer/src/error/inference_error.dart'; library; import "package:analyzer/error/error.dart"; diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart index f6dfa32c446..026f449182f 100644 --- a/pkg/analyzer/lib/src/dart/element/element.dart +++ b/pkg/analyzer/lib/src/dart/element/element.dart @@ -42,6 +42,7 @@ import 'package:analyzer/src/dart/element/type_provider.dart'; import 'package:analyzer/src/dart/element/type_system.dart'; import 'package:analyzer/src/dart/resolver/scope.dart' show Namespace, NamespaceBuilder; +import 'package:analyzer/src/error/inference_error.dart'; import 'package:analyzer/src/generated/engine.dart' show AnalysisContext; import 'package:analyzer/src/generated/source.dart' show DartUriResolver; import 'package:analyzer/src/generated/utilities_collection.dart'; @@ -52,7 +53,6 @@ import 'package:analyzer/src/summary2/export.dart'; import 'package:analyzer/src/summary2/macro.dart'; import 'package:analyzer/src/summary2/macro_application_error.dart'; import 'package:analyzer/src/summary2/reference.dart'; -import 'package:analyzer/src/task/inference_error.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer/src/utilities/extensions/collection.dart'; import 'package:analyzer/src/utilities/extensions/element.dart'; diff --git a/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart b/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart index 018ce73e9ae..79c3737cd09 100644 --- a/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart +++ b/pkg/analyzer/lib/src/dart/error/ffi_code.g.dart @@ -15,7 +15,7 @@ // ignore_for_file: flutter_style_todos /// @docImport 'package:analyzer/src/dart/error/syntactic_errors.g.dart'; -/// @docImport 'package:analyzer/src/task/inference_error.dart'; +/// @docImport 'package:analyzer/src/error/inference_error.dart'; library; import "package:analyzer/error/error.dart"; diff --git a/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart b/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart index f3cc0e802eb..30f6fb3ed1a 100644 --- a/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart +++ b/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart @@ -15,7 +15,7 @@ // ignore_for_file: flutter_style_todos /// @docImport 'package:analyzer/src/dart/error/syntactic_errors.g.dart'; -/// @docImport 'package:analyzer/src/task/inference_error.dart'; +/// @docImport 'package:analyzer/src/error/inference_error.dart'; library; import "package:analyzer/error/error.dart"; diff --git a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart index fe7cb41585d..4506ac271da 100644 --- a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart +++ b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart @@ -15,7 +15,7 @@ // ignore_for_file: flutter_style_todos /// @docImport 'package:analyzer/src/dart/error/syntactic_errors.g.dart'; -/// @docImport 'package:analyzer/src/task/inference_error.dart'; +/// @docImport 'package:analyzer/src/error/inference_error.dart'; library; import "package:analyzer/error/error.dart"; diff --git a/pkg/analyzer/lib/src/error/codes.g.dart b/pkg/analyzer/lib/src/error/codes.g.dart index 78605a98684..8c1df1c1e11 100644 --- a/pkg/analyzer/lib/src/error/codes.g.dart +++ b/pkg/analyzer/lib/src/error/codes.g.dart @@ -15,7 +15,7 @@ // ignore_for_file: flutter_style_todos /// @docImport 'package:analyzer/src/dart/error/syntactic_errors.g.dart'; -/// @docImport 'package:analyzer/src/task/inference_error.dart'; +/// @docImport 'package:analyzer/src/error/inference_error.dart'; library; import "package:analyzer/error/error.dart"; diff --git a/pkg/analyzer/lib/src/task/inference_error.dart b/pkg/analyzer/lib/src/error/inference_error.dart similarity index 100% rename from pkg/analyzer/lib/src/task/inference_error.dart rename to pkg/analyzer/lib/src/error/inference_error.dart diff --git a/pkg/analyzer/lib/src/error/inheritance_override.dart b/pkg/analyzer/lib/src/error/inheritance_override.dart index cb07a35bd06..d98e9a76c3e 100644 --- a/pkg/analyzer/lib/src/error/inheritance_override.dart +++ b/pkg/analyzer/lib/src/error/inheritance_override.dart @@ -19,7 +19,7 @@ import 'package:analyzer/src/dart/element/type_system.dart'; import 'package:analyzer/src/error/codes.dart'; import 'package:analyzer/src/error/correct_override.dart'; import 'package:analyzer/src/error/getter_setter_types_verifier.dart'; -import 'package:analyzer/src/task/inference_error.dart'; +import 'package:analyzer/src/error/inference_error.dart'; import 'package:analyzer/src/utilities/extensions/element.dart'; final _missingMustBeOverridden = Expando>(); diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart index f48b92947e8..fe38a803fd0 100644 --- a/pkg/analyzer/lib/src/generated/resolver.dart +++ b/pkg/analyzer/lib/src/generated/resolver.dart @@ -77,6 +77,7 @@ import 'package:analyzer/src/error/base_or_final_type_verifier.dart'; import 'package:analyzer/src/error/bool_expression_verifier.dart'; import 'package:analyzer/src/error/codes.dart'; import 'package:analyzer/src/error/dead_code_verifier.dart'; +import 'package:analyzer/src/error/inference_error.dart'; import 'package:analyzer/src/error/nullable_dereference_verifier.dart'; import 'package:analyzer/src/error/super_formal_parameters_verifier.dart'; import 'package:analyzer/src/generated/element_resolver.dart'; @@ -85,7 +86,6 @@ import 'package:analyzer/src/generated/inference_log.dart'; import 'package:analyzer/src/generated/static_type_analyzer.dart'; import 'package:analyzer/src/generated/utilities_dart.dart'; import 'package:analyzer/src/generated/variable_type_provider.dart'; -import 'package:analyzer/src/task/inference_error.dart'; import 'package:analyzer/src/util/ast_data_extractor.dart'; import 'package:analyzer/src/utilities/extensions/element.dart'; import 'package:analyzer/src/utilities/extensions/object.dart'; diff --git a/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart b/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart index d387f00db6d..400c5d1ded5 100644 --- a/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart +++ b/pkg/analyzer/lib/src/manifest/manifest_warning_code.g.dart @@ -15,7 +15,7 @@ // ignore_for_file: flutter_style_todos /// @docImport 'package:analyzer/src/dart/error/syntactic_errors.g.dart'; -/// @docImport 'package:analyzer/src/task/inference_error.dart'; +/// @docImport 'package:analyzer/src/error/inference_error.dart'; library; import "package:analyzer/error/error.dart"; diff --git a/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart b/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart index 6901d56da60..9aa813cc629 100644 --- a/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart +++ b/pkg/analyzer/lib/src/pubspec/pubspec_warning_code.g.dart @@ -15,7 +15,7 @@ // ignore_for_file: flutter_style_todos /// @docImport 'package:analyzer/src/dart/error/syntactic_errors.g.dart'; -/// @docImport 'package:analyzer/src/task/inference_error.dart'; +/// @docImport 'package:analyzer/src/error/inference_error.dart'; library; import "package:analyzer/error/error.dart"; diff --git a/pkg/analyzer/lib/src/summary2/bundle_reader.dart b/pkg/analyzer/lib/src/summary2/bundle_reader.dart index 7d385e712d1..e778690fd3f 100644 --- a/pkg/analyzer/lib/src/summary2/bundle_reader.dart +++ b/pkg/analyzer/lib/src/summary2/bundle_reader.dart @@ -21,6 +21,7 @@ import 'package:analyzer/src/dart/element/member.dart'; import 'package:analyzer/src/dart/element/name_union.dart'; import 'package:analyzer/src/dart/element/type.dart'; import 'package:analyzer/src/dart/element/type_algebra.dart'; +import 'package:analyzer/src/error/inference_error.dart'; import 'package:analyzer/src/generated/utilities_dart.dart'; import 'package:analyzer/src/summary2/ast_binary_reader.dart'; import 'package:analyzer/src/summary2/ast_binary_tag.dart'; @@ -32,7 +33,6 @@ import 'package:analyzer/src/summary2/linked_element_factory.dart'; import 'package:analyzer/src/summary2/macro_application_error.dart'; import 'package:analyzer/src/summary2/macro_type_location_storage.dart'; import 'package:analyzer/src/summary2/reference.dart'; -import 'package:analyzer/src/task/inference_error.dart'; import 'package:analyzer/src/utilities/extensions/collection.dart'; import 'package:analyzer/src/utilities/extensions/element.dart'; import 'package:analyzer/src/utilities/extensions/string.dart'; diff --git a/pkg/analyzer/lib/src/summary2/bundle_writer.dart b/pkg/analyzer/lib/src/summary2/bundle_writer.dart index c1fa0ea23b4..c2d7a6126ef 100644 --- a/pkg/analyzer/lib/src/summary2/bundle_writer.dart +++ b/pkg/analyzer/lib/src/summary2/bundle_writer.dart @@ -18,6 +18,7 @@ import 'package:analyzer/src/dart/element/field_name_non_promotability_info.dart import 'package:analyzer/src/dart/element/member.dart'; import 'package:analyzer/src/dart/element/type.dart'; import 'package:analyzer/src/dart/element/type_algebra.dart'; +import 'package:analyzer/src/error/inference_error.dart'; import 'package:analyzer/src/summary2/ast_binary_tag.dart'; import 'package:analyzer/src/summary2/ast_binary_writer.dart'; import 'package:analyzer/src/summary2/data_writer.dart'; @@ -26,7 +27,6 @@ import 'package:analyzer/src/summary2/export.dart'; import 'package:analyzer/src/summary2/macro_application_error.dart'; import 'package:analyzer/src/summary2/macro_type_location_storage.dart'; import 'package:analyzer/src/summary2/reference.dart'; -import 'package:analyzer/src/task/inference_error.dart'; import 'package:analyzer/src/utilities/extensions/object.dart'; class BundleWriter { diff --git a/pkg/analyzer/lib/src/task/strong_mode.dart b/pkg/analyzer/lib/src/summary2/instance_member_inferrer.dart similarity index 99% rename from pkg/analyzer/lib/src/task/strong_mode.dart rename to pkg/analyzer/lib/src/summary2/instance_member_inferrer.dart index 1e31261e239..d195b5c87aa 100644 --- a/pkg/analyzer/lib/src/task/strong_mode.dart +++ b/pkg/analyzer/lib/src/summary2/instance_member_inferrer.dart @@ -10,7 +10,7 @@ import 'package:analyzer/src/dart/element/inheritance_manager3.dart'; import 'package:analyzer/src/dart/element/type.dart'; import 'package:analyzer/src/dart/element/type_algebra.dart'; import 'package:analyzer/src/dart/element/type_system.dart'; -import 'package:analyzer/src/task/inference_error.dart'; +import 'package:analyzer/src/error/inference_error.dart'; import 'package:analyzer/src/util/collection.dart'; import 'package:collection/collection.dart'; diff --git a/pkg/analyzer/lib/src/summary2/top_level_inference.dart b/pkg/analyzer/lib/src/summary2/top_level_inference.dart index 031c1a2d248..a4eecd589e1 100644 --- a/pkg/analyzer/lib/src/summary2/top_level_inference.dart +++ b/pkg/analyzer/lib/src/summary2/top_level_inference.dart @@ -9,12 +9,12 @@ import 'package:analyzer/src/dart/ast/ast.dart'; import 'package:analyzer/src/dart/ast/extensions.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/type.dart'; +import 'package:analyzer/src/error/inference_error.dart'; import 'package:analyzer/src/summary2/ast_resolver.dart'; +import 'package:analyzer/src/summary2/instance_member_inferrer.dart'; import 'package:analyzer/src/summary2/library_builder.dart'; import 'package:analyzer/src/summary2/link.dart'; import 'package:analyzer/src/summary2/linking_node_scope.dart'; -import 'package:analyzer/src/task/inference_error.dart'; -import 'package:analyzer/src/task/strong_mode.dart'; import 'package:analyzer/src/utilities/extensions/object.dart'; import 'package:collection/collection.dart'; diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart index 0bd4f999793..e9b0e9384fc 100644 --- a/pkg/analyzer/test/src/summary/element_text.dart +++ b/pkg/analyzer/test/src/summary/element_text.dart @@ -9,10 +9,10 @@ import 'package:analyzer/dart/element/type.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/field_name_non_promotability_info.dart'; import 'package:analyzer/src/dart/element/member.dart'; +import 'package:analyzer/src/error/inference_error.dart'; import 'package:analyzer/src/summary2/export.dart'; import 'package:analyzer/src/summary2/macro_application_error.dart'; import 'package:analyzer/src/summary2/macro_type_location.dart'; -import 'package:analyzer/src/task/inference_error.dart'; import 'package:analyzer_utilities/testing/tree_string_sink.dart'; import 'package:collection/collection.dart'; import 'package:pub_semver/pub_semver.dart'; diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart index cb07025e047..f174913c558 100644 --- a/pkg/analyzer/tool/messages/generate.dart +++ b/pkg/analyzer/tool/messages/generate.dart @@ -87,7 +87,7 @@ class _AnalyzerErrorGenerator { // ignore_for_file: flutter_style_todos /// @docImport 'package:analyzer/src/dart/error/syntactic_errors.g.dart'; -/// @docImport 'package:analyzer/src/task/inference_error.dart'; +/// @docImport 'package:analyzer/src/error/inference_error.dart'; library; ''');