From 3021cc49130fcc7ca66565caa9ed1e8cc7c09ffd Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Fri, 9 May 2025 10:57:55 -0700 Subject: [PATCH] analyzer: Move PackageConfigFileBuilder to public API. Work towards https://github.com/dart-lang/sdk/issues/55660 Change-Id: I3df2cd374f6b3ef9e027f0e07c748be6ea21ebb2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/427586 Reviewed-by: Paul Berry Commit-Queue: Samuel Rawlins --- pkg/analysis_server/lib/src/plugin/plugin_manager.dart | 2 +- .../test/analysis/notification_errors_test.dart | 2 +- .../test/analysis/update_content_test.dart | 2 +- pkg/analysis_server/test/analysis_server_test.dart | 2 +- pkg/analysis_server/test/domain_analysis_test.dart | 2 +- pkg/analysis_server/test/domain_completion_test.dart | 2 +- pkg/analysis_server/test/edit/fixes_test.dart | 2 +- pkg/analysis_server/test/lsp/diagnostic_test.dart | 2 +- .../test/search/type_hierarchy_test.dart | 2 +- .../services/completion/dart/declaration/uri_test.dart | 2 +- .../completion/dart/location/directive_uri_test.dart | 2 +- .../dart/location/property_access_expression_test.dart | 2 +- .../agnostic/change_method_signature_test.dart | 2 +- .../refactoring/legacy/abstract_refactoring.dart | 2 -- .../services/refactoring/legacy/abstract_rename.dart | 2 -- .../refactoring/legacy/extract_method_test.dart | 1 + .../refactoring/legacy/rename_class_member_test.dart | 1 + .../refactoring/legacy/rename_unit_member_test.dart | 1 + .../test/services/search/search_engine_test.dart | 2 +- .../src/computer/import_elements_computer_test.dart | 2 +- .../src/computer/imported_elements_computer_test.dart | 2 +- .../test/src/plugin/plugin_watcher_test.dart | 2 +- .../services/correction/assist/assist_processor.dart | 2 -- .../fix/add_missing_parameter_required_test.dart | 1 + .../correction/fix/convert_to_package_import_test.dart | 1 + .../correction/fix/create_local_variable_test.dart | 1 + .../fix/data_driven/collection_use_case_test.dart | 2 +- .../correction/fix/data_driven/data_driven_test.dart | 1 + .../fix/data_driven/data_driven_test_support.dart | 1 + .../fix/data_driven/element_matcher_test.dart | 2 +- .../fix/data_driven/platform_use_case_test.dart | 2 +- .../correction/fix/data_driven/test_use_case_test.dart | 2 +- .../fix/data_driven/transform_set_manager_test.dart | 2 +- .../src/services/correction/fix/fix_processor.dart | 2 -- .../correction/fix/import_library_project_test.dart | 1 + .../test/support/configuration_files.dart | 2 +- pkg/analyzer/api.txt | 6 ++++++ .../src/test_utilities/resource_provider_mixin.dart | 2 +- .../package_config_file_builder.dart | 2 ++ .../clients/build_resolvers/build_resolvers_test.dart | 2 +- .../analysis/analysis_context_collection_test.dart | 2 +- .../test/src/dart/analysis/context_locator_test.dart | 2 +- .../test/src/dart/analysis/driver_caching_test.dart | 1 + pkg/analyzer/test/src/dart/analysis/driver_test.dart | 1 + pkg/analyzer/test/src/dart/analysis/search_test.dart | 10 ++++++---- .../dart/resolution/context_collection_resolution.dart | 4 +--- .../test/src/dart/resolution/library_element_test.dart | 1 + .../test/src/dart/resolution/metadata_test.dart | 1 + .../src/diagnostics/deprecated_member_use_test.dart | 1 + .../src/diagnostics/import_internal_library_test.dart | 1 + .../inference_failure_on_instance_creation_test.dart | 1 + .../invalid_language_override_greater_test.dart | 1 + .../invalid_use_of_internal_member_test.dart | 1 + ...nvalid_use_of_visible_for_template_member_test.dart | 1 + ...valid_visible_outside_template_annotation_test.dart | 1 + .../invalid_widget_preview_application_test.dart | 1 + .../invalid_widget_preview_private_argument_test.dart | 1 + .../src/diagnostics/mixin_on_sealed_class_test.dart | 1 + .../redeclare_on_non_redeclaring_member_test.dart | 1 + .../src/diagnostics/subtype_of_sealed_class_test.dart | 1 + .../test/src/diagnostics/unused_element_test.dart | 1 + pkg/analyzer/test/src/workspace/pub_test.dart | 2 +- pkg/analyzer/test/verify_diagnostics_test.dart | 1 + .../change_builder/change_builder_dart_test.dart | 2 +- pkg/analyzer_plugin/test/support/abstract_context.dart | 2 +- .../inherited_reference_contributor_test.dart | 2 +- .../completion/type_member_contributor_test.dart | 2 +- pkg/linter/test/rule_test_support.dart | 3 +-- .../test/rules/always_use_package_imports_test.dart | 1 + pkg/linter/test/rules/analyzer_public_api_test.dart | 1 + .../test/rules/depend_on_referenced_packages_test.dart | 1 + .../test/rules/prefer_relative_imports_test.dart | 1 + pkg/linter/test/rules/public_member_api_docs_test.dart | 1 + .../test/rules/use_test_throws_matchers_test.dart | 1 + 74 files changed, 81 insertions(+), 49 deletions(-) rename pkg/analyzer/lib/{src/test_utilities => utilities}/package_config_file_builder.dart (95%) diff --git a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart index f5f9409d6c3..3c208eb826c 100644 --- a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart +++ b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart @@ -19,11 +19,11 @@ import 'package:analyzer/exception/exception.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/instrumentation/instrumentation.dart'; import 'package:analyzer/src/generated/source.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer/src/util/glob.dart'; import 'package:analyzer/src/workspace/blaze.dart'; import 'package:analyzer/src/workspace/workspace.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/channel/channel.dart'; import 'package:analyzer_plugin/protocol/protocol.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; diff --git a/pkg/analysis_server/test/analysis/notification_errors_test.dart b/pkg/analysis_server/test/analysis/notification_errors_test.dart index 843043ebad0..d9fab96f2a4 100644 --- a/pkg/analysis_server/test/analysis/notification_errors_test.dart +++ b/pkg/analysis_server/test/analysis/notification_errors_test.dart @@ -6,7 +6,7 @@ import 'package:analysis_server/protocol/protocol.dart'; import 'package:analysis_server/protocol/protocol_constants.dart'; import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analyzer/file_system/file_system.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:linter/src/rules.dart'; import 'package:path/path.dart'; diff --git a/pkg/analysis_server/test/analysis/update_content_test.dart b/pkg/analysis_server/test/analysis/update_content_test.dart index 33f322d03f2..ed211e10fe0 100644 --- a/pkg/analysis_server/test/analysis/update_content_test.dart +++ b/pkg/analysis_server/test/analysis/update_content_test.dart @@ -6,13 +6,13 @@ import 'package:analysis_server/protocol/protocol.dart'; import 'package:analysis_server/protocol/protocol_constants.dart'; import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analyzer/file_system/file_system.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../analysis_server_base.dart'; import '../mocks.dart'; -import '../services/refactoring/legacy/abstract_rename.dart'; void main() { defineReflectiveSuite(() { diff --git a/pkg/analysis_server/test/analysis_server_test.dart b/pkg/analysis_server/test/analysis_server_test.dart index fd761cda62f..e25f4334ec7 100644 --- a/pkg/analysis_server/test/analysis_server_test.dart +++ b/pkg/analysis_server/test/analysis_server_test.dart @@ -14,8 +14,8 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/memory_file_system.dart'; import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/test_utilities/mock_sdk.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/domain_analysis_test.dart b/pkg/analysis_server/test/domain_analysis_test.dart index bd242638a65..325d36224b0 100644 --- a/pkg/analysis_server/test/domain_analysis_test.dart +++ b/pkg/analysis_server/test/domain_analysis_test.dart @@ -10,9 +10,9 @@ import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analysis_server/src/analysis_server.dart'; import 'package:analysis_server/src/plugin/plugin_locator.dart'; import 'package:analyzer/file_system/file_system.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer/src/utilities/extensions/file_system.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin; import 'package:analyzer_utilities/testing/test_support.dart'; diff --git a/pkg/analysis_server/test/domain_completion_test.dart b/pkg/analysis_server/test/domain_completion_test.dart index 8eb021bbcf4..cbcefe720a1 100644 --- a/pkg/analysis_server/test/domain_completion_test.dart +++ b/pkg/analysis_server/test/domain_completion_test.dart @@ -6,8 +6,8 @@ import 'dart:async'; import 'package:analysis_server/src/protocol_server.dart'; import 'package:analyzer/file_system/file_system.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/test_code_format.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/edit/fixes_test.dart b/pkg/analysis_server/test/edit/fixes_test.dart index e1512746ff6..64a85430398 100644 --- a/pkg/analysis_server/test/edit/fixes_test.dart +++ b/pkg/analysis_server/test/edit/fixes_test.dart @@ -10,7 +10,7 @@ import 'package:analysis_server/src/plugin/plugin_manager.dart'; import 'package:analysis_server/src/services/correction/fix_internal.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/instrumentation/service.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol.dart' as plugin; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin; diff --git a/pkg/analysis_server/test/lsp/diagnostic_test.dart b/pkg/analysis_server/test/lsp/diagnostic_test.dart index 44d16297bcc..3e24077baf4 100644 --- a/pkg/analysis_server/test/lsp/diagnostic_test.dart +++ b/pkg/analysis_server/test/lsp/diagnostic_test.dart @@ -8,7 +8,7 @@ import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/services/correction/assist_internal.dart'; import 'package:analysis_server/src/services/correction/fix_internal.dart'; import 'package:analyzer/src/lint/registry.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin; import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin; import 'package:linter/src/rules.dart'; diff --git a/pkg/analysis_server/test/search/type_hierarchy_test.dart b/pkg/analysis_server/test/search/type_hierarchy_test.dart index 796cafd7cad..774aef669d8 100644 --- a/pkg/analysis_server/test/search/type_hierarchy_test.dart +++ b/pkg/analysis_server/test/search/type_hierarchy_test.dart @@ -4,7 +4,7 @@ import 'package:analysis_server/protocol/protocol.dart'; import 'package:analysis_server/protocol/protocol_generated.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/completion/dart/declaration/uri_test.dart b/pkg/analysis_server/test/services/completion/dart/declaration/uri_test.dart index 4d3efa5bebb..c19779a5603 100644 --- a/pkg/analysis_server/test/services/completion/dart/declaration/uri_test.dart +++ b/pkg/analysis_server/test/services/completion/dart/declaration/uri_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/completion/dart/location/directive_uri_test.dart b/pkg/analysis_server/test/services/completion/dart/location/directive_uri_test.dart index 24673b54254..75b6218fb8b 100644 --- a/pkg/analysis_server/test/services/completion/dart/location/directive_uri_test.dart +++ b/pkg/analysis_server/test/services/completion/dart/location/directive_uri_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/completion/dart/location/property_access_expression_test.dart b/pkg/analysis_server/test/services/completion/dart/location/property_access_expression_test.dart index b64ec40d0eb..d9d8bb7ad9e 100644 --- a/pkg/analysis_server/test/services/completion/dart/location/property_access_expression_test.dart +++ b/pkg/analysis_server/test/services/completion/dart/location/property_access_expression_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../../../../client/completion_driver_test.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart index a34b621a89f..334641e8440 100644 --- a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart +++ b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart @@ -17,9 +17,9 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/source/source_range.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/summary2/reference.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/test_code_format.dart'; import 'package:analyzer/src/utilities/extensions/file_system.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart'; import 'package:collection/collection.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/legacy/abstract_refactoring.dart b/pkg/analysis_server/test/services/refactoring/legacy/abstract_refactoring.dart index 4ef6a40404b..4a6a4201d83 100644 --- a/pkg/analysis_server/test/services/refactoring/legacy/abstract_refactoring.dart +++ b/pkg/analysis_server/test/services/refactoring/legacy/abstract_refactoring.dart @@ -13,8 +13,6 @@ import 'package:test/test.dart'; import '../../../abstract_single_unit.dart'; -export 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; - int findIdentifierLength(String search) { var length = 0; while (length < search.length) { diff --git a/pkg/analysis_server/test/services/refactoring/legacy/abstract_rename.dart b/pkg/analysis_server/test/services/refactoring/legacy/abstract_rename.dart index 82491221b4a..42bdc43ee03 100644 --- a/pkg/analysis_server/test/services/refactoring/legacy/abstract_rename.dart +++ b/pkg/analysis_server/test/services/refactoring/legacy/abstract_rename.dart @@ -13,8 +13,6 @@ import 'package:test/test.dart'; import 'abstract_refactoring.dart'; -export 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; - /// The base class for all [RenameRefactoring] tests. class RenameRefactoringTest extends RefactoringTest { @override diff --git a/pkg/analysis_server/test/services/refactoring/legacy/extract_method_test.dart b/pkg/analysis_server/test/services/refactoring/legacy/extract_method_test.dart index 9685356b830..cd80f4a0060 100644 --- a/pkg/analysis_server/test/services/refactoring/legacy/extract_method_test.dart +++ b/pkg/analysis_server/test/services/refactoring/legacy/extract_method_test.dart @@ -4,6 +4,7 @@ import 'package:analysis_server/src/services/refactoring/legacy/extract_method.dart'; import 'package:analyzer/source/source.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:analyzer_plugin/src/utilities/string_utilities.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/legacy/rename_class_member_test.dart b/pkg/analysis_server/test/services/refactoring/legacy/rename_class_member_test.dart index f7acf119ea7..c21c01310dc 100644 --- a/pkg/analysis_server/test/services/refactoring/legacy/rename_class_member_test.dart +++ b/pkg/analysis_server/test/services/refactoring/legacy/rename_class_member_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/source/source_range.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/legacy/rename_unit_member_test.dart b/pkg/analysis_server/test/services/refactoring/legacy/rename_unit_member_test.dart index d5bf2b41158..4a3d0ee255a 100644 --- a/pkg/analysis_server/test/services/refactoring/legacy/rename_unit_member_test.dart +++ b/pkg/analysis_server/test/services/refactoring/legacy/rename_unit_member_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/search/search_engine_test.dart b/pkg/analysis_server/test/services/search/search_engine_test.dart index b651c429dd6..a6c305cf52e 100644 --- a/pkg/analysis_server/test/services/search/search_engine_test.dart +++ b/pkg/analysis_server/test/services/search/search_engine_test.dart @@ -9,8 +9,8 @@ import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/src/test_utilities/find_element2.dart'; import 'package:analyzer/src/test_utilities/find_node.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/util/performance/operation_performance.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:collection/collection.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart b/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart index 8941d9b7380..502e9a8d738 100644 --- a/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart +++ b/pkg/analysis_server/test/src/computer/import_elements_computer_test.dart @@ -4,7 +4,7 @@ import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analysis_server/src/computer/import_elements_computer.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:linter/src/rules.dart'; diff --git a/pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart b/pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart index dcd6a8f7dcb..eeeb93e45b6 100644 --- a/pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart +++ b/pkg/analysis_server/test/src/computer/imported_elements_computer_test.dart @@ -4,11 +4,11 @@ import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analysis_server/src/computer/imported_elements_computer.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../../abstract_context.dart'; -import '../../services/refactoring/legacy/abstract_rename.dart'; void main() { defineReflectiveSuite(() { diff --git a/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart b/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart index b2470aaa00f..8a62585ae19 100644 --- a/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart +++ b/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart @@ -8,7 +8,7 @@ import 'package:analysis_server/src/plugin/plugin_locator.dart'; import 'package:analysis_server/src/plugin/plugin_manager.dart'; import 'package:analysis_server/src/plugin/plugin_watcher.dart'; import 'package:analyzer/dart/analysis/context_root.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart b/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart index 99acd4088a0..823f2cc857c 100644 --- a/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart +++ b/pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart @@ -20,8 +20,6 @@ import 'package:test/test.dart'; import '../../../../abstract_single_unit.dart'; import '../../../../utils/test_instrumentation_service.dart'; -export 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; - /// A base class defining support for writing assist processor tests. abstract class AssistProcessorTest extends AbstractSingleUnitTest { late int _offset; diff --git a/pkg/analysis_server/test/src/services/correction/fix/add_missing_parameter_required_test.dart b/pkg/analysis_server/test/src/services/correction/fix/add_missing_parameter_required_test.dart index 52d9dfb3d47..45ed2fb11a2 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/add_missing_parameter_required_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/add_missing_parameter_required_test.dart @@ -5,6 +5,7 @@ import 'package:analysis_server/src/services/correction/fix.dart'; import 'package:analysis_server_plugin/src/correction/change_workspace.dart'; import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/utilities/fixes/fixes.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/services/correction/fix/convert_to_package_import_test.dart b/pkg/analysis_server/test/src/services/correction/fix/convert_to_package_import_test.dart index d85dcd37aac..7b201899a09 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/convert_to_package_import_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/convert_to_package_import_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/fix.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/utilities/fixes/fixes.dart'; import 'package:linter/src/lint_names.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart index 33e80d06a78..dca8e2df74a 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/create_local_variable_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/fix.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/utilities/fixes/fixes.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/collection_use_case_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/collection_use_case_test.dart index 69aece375c3..beb9884d12f 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/collection_use_case_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/collection_use_case_test.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; -import '../fix_processor.dart'; import 'data_driven_test_support.dart'; void main() { diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test.dart index 83f7b079097..967b880dd23 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test.dart @@ -7,6 +7,7 @@ import 'package:analysis_server/src/services/correction/dart/data_driven.dart'; import 'package:analysis_server/src/services/correction/fix/data_driven/transform_set_manager.dart'; import 'package:analysis_server_plugin/edit/dart/correction_producer.dart'; import 'package:analysis_server_plugin/src/correction/fix_generators.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test_support.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test_support.dart index aa1bce45c76..84be139f8ec 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test_support.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test_support.dart @@ -10,6 +10,7 @@ import 'package:analysis_server/src/services/correction/fix/data_driven/transfor import 'package:analysis_server/src/services/correction/fix/data_driven/transform_set_manager.dart'; import 'package:analyzer/diagnostic/diagnostic.dart'; import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/utilities/fixes/fixes.dart'; import '../fix_processor.dart'; diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart index 0b22c0ed6ed..e3a72ae3386 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart @@ -5,7 +5,7 @@ import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart'; import 'package:analysis_server/src/services/correction/fix/data_driven/element_kind.dart'; import 'package:analysis_server/src/services/correction/fix/data_driven/element_matcher.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/platform_use_case_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/platform_use_case_test.dart index 29f67a326e3..01b547ee994 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/platform_use_case_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/platform_use_case_test.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; -import '../fix_processor.dart'; import 'data_driven_test_support.dart'; import 'sdk_fix_test.dart'; diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/test_use_case_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/test_use_case_test.dart index 39c4ae50920..7a13a36bb14 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/test_use_case_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/test_use_case_test.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; -import '../fix_processor.dart'; import 'data_driven_test_support.dart'; void main() { diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_manager_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_manager_test.dart index bfdac343094..acaa1b11705 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_manager_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_manager_test.dart @@ -7,11 +7,11 @@ import 'package:analysis_server/src/services/correction/fix/data_driven/element_ import 'package:analysis_server/src/services/correction/fix/data_driven/transform_set_manager.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/analysis/session.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../../../../../abstract_context.dart'; -import '../../../../../services/refactoring/legacy/abstract_rename.dart'; void main() { defineReflectiveSuite(() { diff --git a/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart b/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart index 67184fa6ac1..7e89aa38eb2 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart @@ -24,8 +24,6 @@ import '../../../../abstract_context.dart'; import '../../../../abstract_single_unit.dart'; import '../../../../utils/test_instrumentation_service.dart'; -export 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; - typedef ErrorFilter = bool Function(Diagnostic diagnostic); abstract class BaseFixProcessorTest extends AbstractSingleUnitTest { diff --git a/pkg/analysis_server/test/src/services/correction/fix/import_library_project_test.dart b/pkg/analysis_server/test/src/services/correction/fix/import_library_project_test.dart index 228e5253b82..97308392ece 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/import_library_project_test.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/import_library_project_test.dart @@ -4,6 +4,7 @@ import 'package:analysis_server/src/services/correction/fix.dart'; import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/utilities/fixes/fixes.dart'; import 'package:linter/src/lint_names.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/support/configuration_files.dart b/pkg/analysis_server/test/support/configuration_files.dart index d844501717d..7653426ddd0 100644 --- a/pkg/analysis_server/test/support/configuration_files.dart +++ b/pkg/analysis_server/test/support/configuration_files.dart @@ -5,9 +5,9 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/dart/analysis/experiments.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_testing/package_root.dart' as package_root; diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt index 552242909ac..f5594b3467e 100644 --- a/pkg/analyzer/api.txt +++ b/pkg/analyzer/api.txt @@ -4828,6 +4828,12 @@ package:analyzer/utilities/extensions/uri.dart: UriExtension (extension on Uri): isImplementation (getter: bool) isSamePackageAs (method: bool Function(Uri)) +package:analyzer/utilities/package_config_file_builder.dart: + PackageConfigFileBuilder (class extends Object): + new (constructor: PackageConfigFileBuilder Function()) + add (method: void Function({String? languageVersion, required String name, String packageUri, required String rootPath})) + copy (method: PackageConfigFileBuilder Function()) + toContent (method: String Function({required String Function(String) toUriStr})) dart:async: Future (referenced) Stream (referenced) diff --git a/pkg/analyzer/lib/src/test_utilities/resource_provider_mixin.dart b/pkg/analyzer/lib/src/test_utilities/resource_provider_mixin.dart index 75272bbb8cc..6f65fe21adf 100644 --- a/pkg/analyzer/lib/src/test_utilities/resource_provider_mixin.dart +++ b/pkg/analyzer/lib/src/test_utilities/resource_provider_mixin.dart @@ -6,8 +6,8 @@ import 'dart:io'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/memory_file_system.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:path/path.dart' as path; /// A mixin for test classes that adds a memory-backed [ResourceProvider] and diff --git a/pkg/analyzer/lib/src/test_utilities/package_config_file_builder.dart b/pkg/analyzer/lib/utilities/package_config_file_builder.dart similarity index 95% rename from pkg/analyzer/lib/src/test_utilities/package_config_file_builder.dart rename to pkg/analyzer/lib/utilities/package_config_file_builder.dart index a2e177d2d76..1b01afc10e9 100644 --- a/pkg/analyzer/lib/src/test_utilities/package_config_file_builder.dart +++ b/pkg/analyzer/lib/utilities/package_config_file_builder.dart @@ -33,12 +33,14 @@ class PackageConfigFileBuilder { ); } + /// Copies this [PackageConfigFileBuilder] into a new instance. PackageConfigFileBuilder copy() { var copy = PackageConfigFileBuilder(); copy._packages.addAll(_packages); return copy; } + /// Returns the contents of the built package config file. String toContent({required String Function(String) toUriStr}) { var buffer = StringBuffer(); diff --git a/pkg/analyzer/test/src/clients/build_resolvers/build_resolvers_test.dart b/pkg/analyzer/test/src/clients/build_resolvers/build_resolvers_test.dart index 96d75f3005b..a091de02a32 100644 --- a/pkg/analyzer/test/src/clients/build_resolvers/build_resolvers_test.dart +++ b/pkg/analyzer/test/src/clients/build_resolvers/build_resolvers_test.dart @@ -9,8 +9,8 @@ import 'package:analyzer/src/clients/build_resolvers/build_resolvers.dart'; import 'package:analyzer/src/context/packages.dart'; import 'package:analyzer/src/source/package_map_resolver.dart'; import 'package:analyzer/src/test_utilities/mock_sdk.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/dart/analysis/analysis_context_collection_test.dart b/pkg/analyzer/test/src/dart/analysis/analysis_context_collection_test.dart index 41f75782c68..4c5312a1419 100644 --- a/pkg/analyzer/test/src/dart/analysis/analysis_context_collection_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/analysis_context_collection_test.dart @@ -17,12 +17,12 @@ import 'package:analyzer/src/utilities/extensions/file_system.dart'; import 'package:analyzer/src/workspace/basic.dart'; import 'package:analyzer/src/workspace/pub.dart'; import 'package:analyzer/src/workspace/workspace.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_utilities/testing/tree_string_sink.dart'; import 'package:linter/src/rules.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; -import '../resolution/context_collection_resolution.dart'; import '../resolution/node_text_expectations.dart'; main() { diff --git a/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart b/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart index ecc456e0641..f30cf7fb7eb 100644 --- a/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart @@ -5,7 +5,6 @@ import 'package:analyzer/dart/analysis/context_root.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/src/dart/analysis/context_locator.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer/src/workspace/basic.dart'; @@ -13,6 +12,7 @@ import 'package:analyzer/src/workspace/blaze.dart'; import 'package:analyzer/src/workspace/gn.dart'; import 'package:analyzer/src/workspace/pub.dart'; import 'package:analyzer/src/workspace/workspace.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart index 87aab819845..3b01e7660f1 100644 --- a/pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart @@ -10,6 +10,7 @@ import 'package:analyzer/diagnostic/diagnostic.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/src/dart/analysis/driver.dart'; import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/dart/analysis/driver_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_test.dart index eac3dbf64a1..194baead99c 100644 --- a/pkg/analyzer/test/src/dart/analysis/driver_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/driver_test.dart @@ -21,6 +21,7 @@ import 'package:analyzer/src/fine/requirements.dart'; import 'package:analyzer/src/lint/linter.dart'; import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart'; import 'package:analyzer/src/utilities/extensions/async.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:analyzer_utilities/testing/tree_string_sink.dart'; import 'package:linter/src/rules.dart'; diff --git a/pkg/analyzer/test/src/dart/analysis/search_test.dart b/pkg/analyzer/test/src/dart/analysis/search_test.dart index f70fdbcaf43..a8494ac23c0 100644 --- a/pkg/analyzer/test/src/dart/analysis/search_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/search_test.dart @@ -10,6 +10,7 @@ import 'package:analyzer/src/dart/analysis/search.dart'; import 'package:analyzer/src/test_utilities/find_element2.dart'; import 'package:analyzer/src/util/performance/operation_performance.dart'; import 'package:analyzer/src/utilities/cancellation.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_utilities/testing/tree_string_sink.dart'; import 'package:collection/collection.dart'; import 'package:test/test.dart'; @@ -2133,10 +2134,11 @@ class B extends A {} } @FailingTest( - // When this test begins passing, the temporary test - // test_searchReferences_ParameterElement_generic_atInvocation_doesNotThrow_issue60005 - // can be removed. - issue: 'https://github.com/dart-lang/sdk/issues/60200') + // When this test begins passing, the temporary test + // test_searchReferences_ParameterElement_generic_atInvocation_doesNotThrow_issue60005 + // can be removed. + issue: 'https://github.com/dart-lang/sdk/issues/60200', + ) test_searchReferences_ParameterElement_generic_atInvocation() async { await resolveTestCode(''' void f() { diff --git a/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart b/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart index 8d2244ef0ee..f72524d4e2b 100644 --- a/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart +++ b/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart @@ -16,13 +16,13 @@ import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/test_utilities/mock_sdk.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer/src/workspace/basic.dart'; import 'package:analyzer/src/workspace/blaze.dart'; import 'package:analyzer/src/workspace/gn.dart'; import 'package:analyzer/src/workspace/pub.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_testing/experiments/experiments.dart'; import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; @@ -36,8 +36,6 @@ import '../analysis/analyzer_state_printer.dart'; import 'node_text_expectations.dart'; import 'resolution.dart'; -export 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; - class BlazeWorkspaceResolutionTest extends ContextResolutionTest { @override List get collectionIncludedPaths => [workspaceRootPath]; diff --git a/pkg/analyzer/test/src/dart/resolution/library_element_test.dart b/pkg/analyzer/test/src/dart/resolution/library_element_test.dart index 93849f1ab12..1062733a8a6 100644 --- a/pkg/analyzer/test/src/dart/resolution/library_element_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/library_element_test.dart @@ -4,6 +4,7 @@ import 'package:analyzer/dart/analysis/features.dart'; import 'package:analyzer/src/dart/analysis/experiments.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:pub_semver/pub_semver.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/dart/resolution/metadata_test.dart b/pkg/analyzer/test/src/dart/resolution/metadata_test.dart index c03ea7c7352..d2fa99a5c78 100644 --- a/pkg/analyzer/test/src/dart/resolution/metadata_test.dart +++ b/pkg/analyzer/test/src/dart/resolution/metadata_test.dart @@ -5,6 +5,7 @@ import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import 'context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/deprecated_member_use_test.dart b/pkg/analyzer/test/src/diagnostics/deprecated_member_use_test.dart index ab235afd565..6f74cb3f304 100644 --- a/pkg/analyzer/test/src/diagnostics/deprecated_member_use_test.dart +++ b/pkg/analyzer/test/src/diagnostics/deprecated_member_use_test.dart @@ -4,6 +4,7 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../../generated/test_support.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/import_internal_library_test.dart b/pkg/analyzer/test/src/diagnostics/import_internal_library_test.dart index 17e919c65ed..0390a4d0e80 100644 --- a/pkg/analyzer/test/src/diagnostics/import_internal_library_test.dart +++ b/pkg/analyzer/test/src/diagnostics/import_internal_library_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/inference_failure_on_instance_creation_test.dart b/pkg/analyzer/test/src/diagnostics/inference_failure_on_instance_creation_test.dart index 3d9a771cb40..889976ea212 100644 --- a/pkg/analyzer/test/src/diagnostics/inference_failure_on_instance_creation_test.dart +++ b/pkg/analyzer/test/src/diagnostics/inference_failure_on_instance_creation_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart index 00db91a4eb3..16d56fe80ee 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart @@ -4,6 +4,7 @@ import 'package:analyzer/src/dart/analysis/experiments.dart'; import 'package:analyzer/src/error/codes.g.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:pub_semver/pub_semver.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/invalid_use_of_internal_member_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_use_of_internal_member_test.dart index b345ef98124..c277086965d 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_use_of_internal_member_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_use_of_internal_member_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/invalid_use_of_visible_for_template_member_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_use_of_visible_for_template_member_test.dart index 96f14470a37..900460ddaed 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_use_of_visible_for_template_member_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_use_of_visible_for_template_member_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/invalid_visible_outside_template_annotation_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_visible_outside_template_annotation_test.dart index 2e386bda6c5..756703fbf40 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_visible_outside_template_annotation_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_visible_outside_template_annotation_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/invalid_widget_preview_application_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_widget_preview_application_test.dart index f99da54eb51..8cd1abacc66 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_widget_preview_application_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_widget_preview_application_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.g.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/invalid_widget_preview_private_argument_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_widget_preview_private_argument_test.dart index 1abf9bc17ca..3142bb236de 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_widget_preview_private_argument_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_widget_preview_private_argument_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.g.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/mixin_on_sealed_class_test.dart b/pkg/analyzer/test/src/diagnostics/mixin_on_sealed_class_test.dart index 926ac09fc96..f856bacdb47 100644 --- a/pkg/analyzer/test/src/diagnostics/mixin_on_sealed_class_test.dart +++ b/pkg/analyzer/test/src/diagnostics/mixin_on_sealed_class_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/redeclare_on_non_redeclaring_member_test.dart b/pkg/analyzer/test/src/diagnostics/redeclare_on_non_redeclaring_member_test.dart index 5168032bb53..13c1082ac17 100644 --- a/pkg/analyzer/test/src/diagnostics/redeclare_on_non_redeclaring_member_test.dart +++ b/pkg/analyzer/test/src/diagnostics/redeclare_on_non_redeclaring_member_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/subtype_of_sealed_class_test.dart b/pkg/analyzer/test/src/diagnostics/subtype_of_sealed_class_test.dart index b1dd0defa4f..273d8dcf2ea 100644 --- a/pkg/analyzer/test/src/diagnostics/subtype_of_sealed_class_test.dart +++ b/pkg/analyzer/test/src/diagnostics/subtype_of_sealed_class_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/unused_element_test.dart b/pkg/analyzer/test/src/diagnostics/unused_element_test.dart index 3ef9db58d00..becefde6dbd 100644 --- a/pkg/analyzer/test/src/diagnostics/unused_element_test.dart +++ b/pkg/analyzer/test/src/diagnostics/unused_element_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/expect.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/workspace/pub_test.dart b/pkg/analyzer/test/src/workspace/pub_test.dart index 6e9ef23bc27..e99203702a5 100644 --- a/pkg/analyzer/test/src/workspace/pub_test.dart +++ b/pkg/analyzer/test/src/workspace/pub_test.dart @@ -11,11 +11,11 @@ import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; import 'package:analyzer/src/workspace/basic.dart'; import 'package:analyzer/src/workspace/pub.dart'; import 'package:analyzer/src/workspace/workspace.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../../generated/test_support.dart'; -import '../dart/resolution/context_collection_resolution.dart'; import 'workspace_test_support.dart'; main() { diff --git a/pkg/analyzer/test/verify_diagnostics_test.dart b/pkg/analyzer/test/verify_diagnostics_test.dart index 58bdb8a5b7d..bfc218d609c 100644 --- a/pkg/analyzer/test/verify_diagnostics_test.dart +++ b/pkg/analyzer/test/verify_diagnostics_test.dart @@ -4,6 +4,7 @@ import 'package:analyzer/diagnostic/diagnostic.dart'; import 'package:analyzer/error/error.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart index c7b328e0536..29dc19b1141 100644 --- a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart +++ b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart @@ -11,7 +11,7 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/source/source_range.dart'; import 'package:analyzer/src/dart/element/inheritance_manager3.dart'; import 'package:analyzer/src/test_utilities/find_node.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element; import 'package:analyzer_plugin/src/utilities/change_builder/change_builder_dart.dart' show DartFileEditBuilderImpl, DartLinkedEditBuilderImpl; diff --git a/pkg/analyzer_plugin/test/support/abstract_context.dart b/pkg/analyzer_plugin/test/support/abstract_context.dart index d56d2709075..52969e406e3 100644 --- a/pkg/analyzer_plugin/test/support/abstract_context.dart +++ b/pkg/analyzer_plugin/test/support/abstract_context.dart @@ -11,8 +11,8 @@ import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart'; import 'package:analyzer/src/dart/analysis/byte_store.dart'; import 'package:analyzer/src/generated/engine.dart' show AnalysisEngine; import 'package:analyzer/src/test_utilities/mock_sdk.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_testing/experiments/experiments.dart'; import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:linter/src/rules.dart'; diff --git a/pkg/analyzer_plugin/test/utilities/completion/inherited_reference_contributor_test.dart b/pkg/analyzer_plugin/test/utilities/completion/inherited_reference_contributor_test.dart index 9ee63f3de26..61b80828ad7 100644 --- a/pkg/analyzer_plugin/test/utilities/completion/inherited_reference_contributor_test.dart +++ b/pkg/analyzer_plugin/test/utilities/completion/inherited_reference_contributor_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/utilities/completion/completion_core.dart'; import 'package:analyzer_plugin/utilities/completion/inherited_reference_contributor.dart'; import 'package:test/test.dart'; diff --git a/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart b/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart index 12e9727b8e5..36c80732c92 100644 --- a/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart +++ b/pkg/analyzer_plugin/test/utilities/completion/type_member_contributor_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:analyzer_plugin/utilities/completion/completion_core.dart'; import 'package:analyzer_plugin/utilities/completion/relevance.dart'; diff --git a/pkg/linter/test/rule_test_support.dart b/pkg/linter/test/rule_test_support.dart index af39bfeb077..b030f75d017 100644 --- a/pkg/linter/test/rule_test_support.dart +++ b/pkg/linter/test/rule_test_support.dart @@ -19,8 +19,8 @@ import 'package:analyzer/src/lint/pub.dart'; import 'package:analyzer/src/lint/registry.dart'; import 'package:analyzer/src/lint/util.dart'; import 'package:analyzer/src/test_utilities/mock_sdk.dart'; -import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_testing/experiments/experiments.dart'; import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; @@ -32,7 +32,6 @@ import 'package:test/test.dart'; export 'package:analyzer/src/dart/error/syntactic_errors.dart'; export 'package:analyzer/src/error/codes.dart'; -export 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; export 'package:linter/src/lint_names.dart'; ExpectedDiagnostic error( diff --git a/pkg/linter/test/rules/always_use_package_imports_test.dart b/pkg/linter/test/rules/always_use_package_imports_test.dart index 821e5342474..774aecc3b96 100644 --- a/pkg/linter/test/rules/always_use_package_imports_test.dart +++ b/pkg/linter/test/rules/always_use_package_imports_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../rule_test_support.dart'; diff --git a/pkg/linter/test/rules/analyzer_public_api_test.dart b/pkg/linter/test/rules/analyzer_public_api_test.dart index 619e2ec7c18..9d259c9f875 100644 --- a/pkg/linter/test/rules/analyzer_public_api_test.dart +++ b/pkg/linter/test/rules/analyzer_public_api_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:linter/src/rules/analyzer_public_api.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/linter/test/rules/depend_on_referenced_packages_test.dart b/pkg/linter/test/rules/depend_on_referenced_packages_test.dart index 3efd886684b..2ada185b653 100644 --- a/pkg/linter/test/rules/depend_on_referenced_packages_test.dart +++ b/pkg/linter/test/rules/depend_on_referenced_packages_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../rule_test_support.dart'; diff --git a/pkg/linter/test/rules/prefer_relative_imports_test.dart b/pkg/linter/test/rules/prefer_relative_imports_test.dart index d7594fe58fb..b2bd0b43e25 100644 --- a/pkg/linter/test/rules/prefer_relative_imports_test.dart +++ b/pkg/linter/test/rules/prefer_relative_imports_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../rule_test_support.dart'; diff --git a/pkg/linter/test/rules/public_member_api_docs_test.dart b/pkg/linter/test/rules/public_member_api_docs_test.dart index 4e9f397eafd..cf42e3c049b 100644 --- a/pkg/linter/test/rules/public_member_api_docs_test.dart +++ b/pkg/linter/test/rules/public_member_api_docs_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/linter/test/rules/use_test_throws_matchers_test.dart b/pkg/linter/test/rules/use_test_throws_matchers_test.dart index fc916ffa5af..5ae0ddd7732 100644 --- a/pkg/linter/test/rules/use_test_throws_matchers_test.dart +++ b/pkg/linter/test/rules/use_test_throws_matchers_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:analyzer/utilities/package_config_file_builder.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../rule_test_support.dart';