From 7d3bc4862d93b02806bb4497c0ce2f2709e46446 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Fri, 13 Nov 2020 17:46:30 +0000 Subject: [PATCH] Rename pkg/analysis_tool to pkg/analyzer_utilities. It's no longer just for the tools in the `tool` directory; it also contains test utilities for use by the analyzer and related packages. Change-Id: I0f8cf57f24ea7aad8e2177e43ee2bcb2ab3030da Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/171704 Commit-Queue: Paul Berry Reviewed-by: Konstantin Shcheglov Reviewed-by: Brian Wilkerson --- .dart_tool/package_config.json | 12 ++++++------ .packages | 2 +- pkg/analysis_server/pubspec.yaml | 2 +- .../test/src/utilities/mock_packages.dart | 2 +- pkg/analysis_server/test/verify_sorted_test.dart | 2 +- pkg/analysis_server/test/verify_tests_test.dart | 4 ++-- .../relevance_table_generator.dart | 4 ++-- pkg/analysis_server/tool/spec/check_all_test.dart | 2 +- .../tool/spec/codegen_analysis_server.dart | 2 +- .../tool/spec/codegen_dart_notification_handler.dart | 2 +- .../tool/spec/codegen_dart_protocol.dart | 2 +- .../tool/spec/codegen_inttest_methods.dart | 2 +- pkg/analysis_server/tool/spec/codegen_java.dart | 2 +- .../tool/spec/codegen_java_types.dart | 2 +- pkg/analysis_server/tool/spec/codegen_matchers.dart | 2 +- .../tool/spec/codegen_protocol_constants.dart | 2 +- pkg/analysis_server/tool/spec/from_html.dart | 2 +- pkg/analysis_server/tool/spec/generate_all.dart | 2 +- pkg/analysis_server/tool/spec/implied_types.dart | 2 +- pkg/analysis_server/tool/spec/to_html.dart | 4 ++-- pkg/analysis_server_client/pubspec.yaml | 4 ++-- .../test/verify_sorted_test.dart | 2 +- pkg/analyzer/pubspec.yaml | 4 ++-- .../test/src/fasta/message_coverage_test.dart | 2 +- .../summary2/ast_text_printer_integration_test.dart | 2 +- pkg/analyzer/test/verify_docs_test.dart | 2 +- pkg/analyzer/test/verify_tests_test.dart | 4 ++-- pkg/analyzer/tool/diagnostics/generate.dart | 2 +- pkg/analyzer/tool/experiments/experiments_test.dart | 2 +- pkg/analyzer/tool/experiments/generate.dart | 4 ++-- pkg/analyzer/tool/messages/generate.dart | 4 ++-- pkg/analyzer/tool/summary/check_test.dart | 4 ++-- pkg/analyzer/tool/summary/generate.dart | 2 +- pkg/analyzer_plugin/pubspec.yaml | 4 ++-- pkg/analyzer_plugin/test/verify_tests_test.dart | 4 ++-- pkg/analyzer_plugin/tool/spec/check_all_test.dart | 2 +- .../tool/spec/codegen_dart_protocol.dart | 2 +- .../tool/spec/codegen_inttest_methods.dart | 2 +- pkg/analyzer_plugin/tool/spec/codegen_matchers.dart | 2 +- .../tool/spec/codegen_protocol_common.dart | 2 +- .../tool/spec/codegen_protocol_constants.dart | 2 +- pkg/analyzer_plugin/tool/spec/from_html.dart | 2 +- pkg/analyzer_plugin/tool/spec/generate_all.dart | 2 +- pkg/analyzer_plugin/tool/spec/implied_types.dart | 2 +- pkg/analyzer_plugin/tool/spec/to_html.dart | 4 ++-- pkg/{analysis_tool => analyzer_utilities}/README.md | 0 .../analysis_options.yaml | 0 .../lib/html.dart | 0 .../lib/package_root.dart | 0 .../lib/text_formatter.dart | 2 +- .../lib/tools.dart | 4 ++-- .../lib/verify_tests.dart | 0 .../pubspec.yaml | 2 +- pkg/nnbd_migration/pubspec.yaml | 4 ++-- pkg/nnbd_migration/test/verify_tests_test.dart | 4 ++-- pkg/nnbd_migration/tool/steamroll_ecosystem.sh | 8 ++++---- 56 files changed, 74 insertions(+), 74 deletions(-) rename pkg/{analysis_tool => analyzer_utilities}/README.md (100%) rename pkg/{analysis_tool => analyzer_utilities}/analysis_options.yaml (100%) rename pkg/{analysis_tool => analyzer_utilities}/lib/html.dart (100%) rename pkg/{analysis_tool => analyzer_utilities}/lib/package_root.dart (100%) rename pkg/{analysis_tool => analyzer_utilities}/lib/text_formatter.dart (99%) rename pkg/{analysis_tool => analyzer_utilities}/lib/tools.dart (99%) rename pkg/{analysis_tool => analyzer_utilities}/lib/verify_tests.dart (100%) rename pkg/{analysis_tool => analyzer_utilities}/pubspec.yaml (88%) diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 24ce857b2be..7e58d34a423 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -73,12 +73,6 @@ "packageUri": "lib/", "languageVersion": "2.8" }, - { - "name": "analysis_tool", - "rootUri": "../pkg/analysis_tool", - "packageUri": "lib/", - "languageVersion": "2.1" - }, { "name": "analyzer", "rootUri": "../pkg/analyzer", @@ -97,6 +91,12 @@ "packageUri": "lib/", "languageVersion": "2.3" }, + { + "name": "analyzer_utilities", + "rootUri": "../pkg/analyzer_utilities", + "packageUri": "lib/", + "languageVersion": "2.1" + }, { "name": "args", "rootUri": "../third_party/pkg/args", diff --git a/.packages b/.packages index 22dab415632..f264745b12b 100644 --- a/.packages +++ b/.packages @@ -10,10 +10,10 @@ _fe_analyzer_shared:pkg/_fe_analyzer_shared/lib _js_interop_checks:pkg/_js_interop_checks/lib analysis_server:pkg/analysis_server/lib analysis_server_client:pkg/analysis_server_client/lib -analysis_tool:pkg/analysis_tool/lib analyzer:pkg/analyzer/lib analyzer_cli:pkg/analyzer_cli/lib analyzer_plugin:pkg/analyzer_plugin/lib +analyzer_utilities:pkg/analyzer_utilities/lib args:third_party/pkg/args/lib async:third_party/pkg/async/lib async_helper:pkg/async_helper/lib diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml index da3e6a60d05..2b6420351b5 100644 --- a/pkg/analysis_server/pubspec.yaml +++ b/pkg/analysis_server/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: yaml: any dev_dependencies: - analysis_tool: any + analyzer_utilities: any http: any logging: any matcher: any diff --git a/pkg/analysis_server/test/src/utilities/mock_packages.dart b/pkg/analysis_server/test/src/utilities/mock_packages.dart index 1a34e4a0e8b..c60002df58b 100644 --- a/pkg/analysis_server/test/src/utilities/mock_packages.dart +++ b/pkg/analysis_server/test/src/utilities/mock_packages.dart @@ -2,10 +2,10 @@ // 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:analysis_tool/package_root.dart' as package_root; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/memory_file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; /// Helper for copying files from "tests/mock_packages" to memory file system. class MockPackages { diff --git a/pkg/analysis_server/test/verify_sorted_test.dart b/pkg/analysis_server/test/verify_sorted_test.dart index b59ef2babb9..60fda8d3f91 100644 --- a/pkg/analysis_server/test/verify_sorted_test.dart +++ b/pkg/analysis_server/test/verify_sorted_test.dart @@ -5,12 +5,12 @@ import 'dart:io'; import 'package:analysis_server/src/services/correction/sort_members.dart'; -import 'package:analysis_tool/package_root.dart'; import 'package:analyzer/dart/analysis/analysis_context_collection.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/analysis/session.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; +import 'package:analyzer_utilities/package_root.dart'; import 'package:meta/meta.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/verify_tests_test.dart b/pkg/analysis_server/test/verify_tests_test.dart index 73aa656af42..4b07a765637 100644 --- a/pkg/analysis_server/test/verify_tests_test.dart +++ b/pkg/analysis_server/test/verify_tests_test.dart @@ -2,10 +2,10 @@ // 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:analysis_tool/package_root.dart' as package_root; -import 'package:analysis_tool/verify_tests.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_utilities/verify_tests.dart'; void main() { var provider = PhysicalResourceProvider.INSTANCE; diff --git a/pkg/analysis_server/tool/completion_metrics/relevance_table_generator.dart b/pkg/analysis_server/tool/completion_metrics/relevance_table_generator.dart index 74ef351b7f0..21230de3989 100644 --- a/pkg/analysis_server/tool/completion_metrics/relevance_table_generator.dart +++ b/pkg/analysis_server/tool/completion_metrics/relevance_table_generator.dart @@ -8,8 +8,6 @@ import 'package:_fe_analyzer_shared/src/base/syntactic_entity.dart'; import 'package:analysis_server/src/protocol_server.dart' show ElementKind; import 'package:analysis_server/src/services/completion/dart/feature_computer.dart'; import 'package:analysis_server/src/utilities/flutter.dart'; -import 'package:analysis_tool/package_root.dart' as package_root; -import 'package:analysis_tool/tools.dart'; import 'package:analyzer/dart/analysis/analysis_context_collection.dart'; import 'package:analyzer/dart/analysis/context_root.dart'; import 'package:analyzer/dart/analysis/results.dart'; @@ -24,6 +22,8 @@ import 'package:analyzer/diagnostic/diagnostic.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/dart/element/inheritance_manager3.dart'; import 'package:analyzer/src/generated/engine.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_utilities/tools.dart'; import 'package:args/args.dart'; import 'package:meta/meta.dart'; diff --git a/pkg/analysis_server/tool/spec/check_all_test.dart b/pkg/analysis_server/tool/spec/check_all_test.dart index de4be12f43a..3be8ed79b5a 100644 --- a/pkg/analysis_server/tool/spec/check_all_test.dart +++ b/pkg/analysis_server/tool/spec/check_all_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'generate_all.dart'; diff --git a/pkg/analysis_server/tool/spec/codegen_analysis_server.dart b/pkg/analysis_server/tool/spec/codegen_analysis_server.dart index e72548d6349..9e19fb62656 100644 --- a/pkg/analysis_server/tool/spec/codegen_analysis_server.dart +++ b/pkg/analysis_server/tool/spec/codegen_analysis_server.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Code generation for the file "AnalysisServer.java". -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'api.dart'; import 'codegen_java.dart'; diff --git a/pkg/analysis_server/tool/spec/codegen_dart_notification_handler.dart b/pkg/analysis_server/tool/spec/codegen_dart_notification_handler.dart index 7fddd046a0d..65515efd1d1 100644 --- a/pkg/analysis_server/tool/spec/codegen_dart_notification_handler.dart +++ b/pkg/analysis_server/tool/spec/codegen_dart_notification_handler.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:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:html/dom.dart'; import 'api.dart'; diff --git a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart index a9da290f23a..2acef5761e5 100644 --- a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart +++ b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart @@ -4,7 +4,7 @@ import 'dart:convert'; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:html/dom.dart' as dom; import 'package:path/path.dart' as path; diff --git a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart index 09a412bb568..208e0a049e4 100644 --- a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart +++ b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Code generation for the file "integration_test_methods.dart". -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart' as path; import 'api.dart'; diff --git a/pkg/analysis_server/tool/spec/codegen_java.dart b/pkg/analysis_server/tool/spec/codegen_java.dart index f898732b8df..341e4e1038a 100644 --- a/pkg/analysis_server/tool/spec/codegen_java.dart +++ b/pkg/analysis_server/tool/spec/codegen_java.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Tools for Java code generation. -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:html/dom.dart' as dom; import 'api.dart'; diff --git a/pkg/analysis_server/tool/spec/codegen_java_types.dart b/pkg/analysis_server/tool/spec/codegen_java_types.dart index 4ecbc1dc9cf..a59a7884b7b 100644 --- a/pkg/analysis_server/tool/spec/codegen_java_types.dart +++ b/pkg/analysis_server/tool/spec/codegen_java_types.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Code generation for the file "AnalysisServer.java". -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:html/dom.dart' as dom; import 'api.dart'; diff --git a/pkg/analysis_server/tool/spec/codegen_matchers.dart b/pkg/analysis_server/tool/spec/codegen_matchers.dart index afe7545431a..2e539753103 100644 --- a/pkg/analysis_server/tool/spec/codegen_matchers.dart +++ b/pkg/analysis_server/tool/spec/codegen_matchers.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Code generation for the file "matchers.dart". -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'api.dart'; import 'from_html.dart'; diff --git a/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart b/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart index 12e2dc205c7..511f2609b80 100644 --- a/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart +++ b/pkg/analysis_server/tool/spec/codegen_protocol_constants.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:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'api.dart'; import 'codegen_dart.dart'; diff --git a/pkg/analysis_server/tool/spec/from_html.dart b/pkg/analysis_server/tool/spec/from_html.dart index 5496a9c9511..237a6a743fa 100644 --- a/pkg/analysis_server/tool/spec/from_html.dart +++ b/pkg/analysis_server/tool/spec/from_html.dart @@ -5,7 +5,7 @@ /// Code for reading an HTML API description. import 'dart:io'; -import 'package:analysis_tool/html.dart'; +import 'package:analyzer_utilities/html.dart'; import 'package:html/dom.dart' as dom; import 'package:html/parser.dart' as parser; import 'package:path/path.dart'; diff --git a/pkg/analysis_server/tool/spec/generate_all.dart b/pkg/analysis_server/tool/spec/generate_all.dart index ac9eb913268..20840ce27ca 100644 --- a/pkg/analysis_server/tool/spec/generate_all.dart +++ b/pkg/analysis_server/tool/spec/generate_all.dart @@ -4,7 +4,7 @@ import 'dart:io'; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'codegen_analysis_server.dart' as codegen_analysis_server; diff --git a/pkg/analysis_server/tool/spec/implied_types.dart b/pkg/analysis_server/tool/spec/implied_types.dart index 44d89c25397..fb67058c22e 100644 --- a/pkg/analysis_server/tool/spec/implied_types.dart +++ b/pkg/analysis_server/tool/spec/implied_types.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Code for enumerating the set of types implied by the API. -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'api.dart'; diff --git a/pkg/analysis_server/tool/spec/to_html.dart b/pkg/analysis_server/tool/spec/to_html.dart index 9ad321a169a..db50d44cd8a 100644 --- a/pkg/analysis_server/tool/spec/to_html.dart +++ b/pkg/analysis_server/tool/spec/to_html.dart @@ -7,8 +7,8 @@ /// in generated code. import 'dart:convert'; -import 'package:analysis_tool/html.dart'; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/html.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:html/dom.dart' as dom; import 'api.dart'; diff --git a/pkg/analysis_server_client/pubspec.yaml b/pkg/analysis_server_client/pubspec.yaml index 465884d1fd8..0589bc3f51e 100644 --- a/pkg/analysis_server_client/pubspec.yaml +++ b/pkg/analysis_server_client/pubspec.yaml @@ -15,6 +15,6 @@ dev_dependencies: path: ../analyzer analysis_server: path: ../analysis_server - analysis_tool: - path: ../analysis_tool + analyzer_utilities: + path: ../analyzer_utilities test: ^1.14.2 diff --git a/pkg/analysis_server_client/test/verify_sorted_test.dart b/pkg/analysis_server_client/test/verify_sorted_test.dart index 66a848ac8bd..79d7299bbac 100644 --- a/pkg/analysis_server_client/test/verify_sorted_test.dart +++ b/pkg/analysis_server_client/test/verify_sorted_test.dart @@ -5,12 +5,12 @@ import 'dart:io'; import 'package:analysis_server/src/services/correction/sort_members.dart'; -import 'package:analysis_tool/package_root.dart'; import 'package:analyzer/dart/analysis/analysis_context_collection.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/analysis/session.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; +import 'package:analyzer_utilities/package_root.dart'; import 'package:test/test.dart'; void main() { diff --git a/pkg/analyzer/pubspec.yaml b/pkg/analyzer/pubspec.yaml index 0ad2ec60db1..f097d372a6f 100644 --- a/pkg/analyzer/pubspec.yaml +++ b/pkg/analyzer/pubspec.yaml @@ -22,8 +22,8 @@ dependencies: watcher: ^0.9.6 yaml: ^2.1.2 dev_dependencies: - analysis_tool: - path: ../analysis_tool + analyzer_utilities: + path: ../analyzer_utilities linter: any matcher: ^0.12.3 pedantic: ^1.9.0 diff --git a/pkg/analyzer/test/src/fasta/message_coverage_test.dart b/pkg/analyzer/test/src/fasta/message_coverage_test.dart index 8b309c8228a..73a7fac4e09 100644 --- a/pkg/analyzer/test/src/fasta/message_coverage_test.dart +++ b/pkg/analyzer/test/src/fasta/message_coverage_test.dart @@ -4,9 +4,9 @@ import 'dart:io' as io; -import 'package:analysis_tool/package_root.dart' as package_root; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/ast/visitor.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; import 'package:path/path.dart' as path; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analyzer/test/src/summary2/ast_text_printer_integration_test.dart b/pkg/analyzer/test/src/summary2/ast_text_printer_integration_test.dart index 867debea9b3..64623f81049 100644 --- a/pkg/analyzer/test/src/summary2/ast_text_printer_integration_test.dart +++ b/pkg/analyzer/test/src/summary2/ast_text_printer_integration_test.dart @@ -4,8 +4,8 @@ import 'dart:io'; -import 'package:analysis_tool/package_root.dart' as package_root; import 'package:analyzer/file_system/physical_file_system.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; import 'package:test/test.dart'; import '../dart/ast/parse_base.dart'; diff --git a/pkg/analyzer/test/verify_docs_test.dart b/pkg/analyzer/test/verify_docs_test.dart index 225440903b3..32e6bc17dbd 100644 --- a/pkg/analyzer/test/verify_docs_test.dart +++ b/pkg/analyzer/test/verify_docs_test.dart @@ -4,7 +4,6 @@ import 'dart:convert'; -import 'package:analysis_tool/package_root.dart' as package_root; import 'package:analyzer/dart/analysis/analysis_context.dart'; import 'package:analyzer/dart/analysis/analysis_context_collection.dart'; import 'package:analyzer/dart/analysis/results.dart'; @@ -13,6 +12,7 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/overlay_file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/error/codes.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; import 'package:test/test.dart'; main() async { diff --git a/pkg/analyzer/test/verify_tests_test.dart b/pkg/analyzer/test/verify_tests_test.dart index d1e1e17bb26..3db4bb79312 100644 --- a/pkg/analyzer/test/verify_tests_test.dart +++ b/pkg/analyzer/test/verify_tests_test.dart @@ -2,10 +2,10 @@ // 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:analysis_tool/package_root.dart' as package_root; -import 'package:analysis_tool/verify_tests.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_utilities/verify_tests.dart'; main() { var provider = PhysicalResourceProvider.INSTANCE; diff --git a/pkg/analyzer/tool/diagnostics/generate.dart b/pkg/analyzer/tool/diagnostics/generate.dart index 18dcbd203fb..7571b562c2b 100644 --- a/pkg/analyzer/tool/diagnostics/generate.dart +++ b/pkg/analyzer/tool/diagnostics/generate.dart @@ -4,13 +4,13 @@ import 'dart:io'; -import 'package:analysis_tool/package_root.dart' as package_root; import 'package:analyzer/dart/analysis/analysis_context_collection.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/analysis/session.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/ast/token.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; import 'package:path/src/context.dart'; /// Generate the file `diagnostics.md` based on the documentation associated diff --git a/pkg/analyzer/tool/experiments/experiments_test.dart b/pkg/analyzer/tool/experiments/experiments_test.dart index 4f77ee3f388..575c084d2cf 100644 --- a/pkg/analyzer/tool/experiments/experiments_test.dart +++ b/pkg/analyzer/tool/experiments/experiments_test.dart @@ -4,7 +4,7 @@ import "dart:io" show Platform; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'generate.dart'; diff --git a/pkg/analyzer/tool/experiments/generate.dart b/pkg/analyzer/tool/experiments/generate.dart index ac315ad2adb..6e280183222 100644 --- a/pkg/analyzer/tool/experiments/generate.dart +++ b/pkg/analyzer/tool/experiments/generate.dart @@ -4,8 +4,8 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/scanner/characters.dart' show $MINUS, $_; -import 'package:analysis_tool/package_root.dart' as pkg_root; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/package_root.dart' as pkg_root; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'package:yaml/yaml.dart' show YamlMap, loadYaml; diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart index 23e066e97a7..e8451776802 100644 --- a/pkg/analyzer/tool/messages/generate.dart +++ b/pkg/analyzer/tool/messages/generate.dart @@ -13,10 +13,10 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/scanner/scanner.dart'; -import 'package:analysis_tool/package_root.dart' as pkg_root; -import 'package:analysis_tool/tools.dart'; import 'package:analyzer/error/error.dart'; import 'package:analyzer/src/dart/error/syntactic_errors.dart'; +import 'package:analyzer_utilities/package_root.dart' as pkg_root; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'package:yaml/yaml.dart' show loadYaml; diff --git a/pkg/analyzer/tool/summary/check_test.dart b/pkg/analyzer/tool/summary/check_test.dart index 34edda7b212..a5d0473c966 100644 --- a/pkg/analyzer/tool/summary/check_test.dart +++ b/pkg/analyzer/tool/summary/check_test.dart @@ -2,8 +2,8 @@ // 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:analysis_tool/package_root.dart' as package_root; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'generate.dart'; diff --git a/pkg/analyzer/tool/summary/generate.dart b/pkg/analyzer/tool/summary/generate.dart index 945b34c60b3..3bba6a21b70 100644 --- a/pkg/analyzer/tool/summary/generate.dart +++ b/pkg/analyzer/tool/summary/generate.dart @@ -20,7 +20,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/scanner/scanner.dart'; import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'idl_model.dart' as idl_model; import 'mini_ast.dart'; diff --git a/pkg/analyzer_plugin/pubspec.yaml b/pkg/analyzer_plugin/pubspec.yaml index 50a1e058330..b3ba237b59e 100644 --- a/pkg/analyzer_plugin/pubspec.yaml +++ b/pkg/analyzer_plugin/pubspec.yaml @@ -14,8 +14,8 @@ dependencies: pub_semver: '^1.3.2' dev_dependencies: - analysis_tool: - path: ../analysis_tool + analyzer_utilities: + path: ../analyzer_utilities html: '>=0.13.1 <0.15.0' path: '^1.4.1' test_reflective_loader: ^0.1.8 diff --git a/pkg/analyzer_plugin/test/verify_tests_test.dart b/pkg/analyzer_plugin/test/verify_tests_test.dart index 3ea9290cdc2..48657ce82b4 100644 --- a/pkg/analyzer_plugin/test/verify_tests_test.dart +++ b/pkg/analyzer_plugin/test/verify_tests_test.dart @@ -2,10 +2,10 @@ // 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:analysis_tool/package_root.dart' as package_root; -import 'package:analysis_tool/verify_tests.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_utilities/verify_tests.dart'; void main() { var provider = PhysicalResourceProvider.INSTANCE; diff --git a/pkg/analyzer_plugin/tool/spec/check_all_test.dart b/pkg/analyzer_plugin/tool/spec/check_all_test.dart index 2d4f1842387..24b06fa42f3 100644 --- a/pkg/analyzer_plugin/tool/spec/check_all_test.dart +++ b/pkg/analyzer_plugin/tool/spec/check_all_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'generate_all.dart'; diff --git a/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart b/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart index 93c58c09fa8..6497fe841a1 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart @@ -4,7 +4,7 @@ import 'dart:convert'; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:html/dom.dart' as dom; import 'package:path/path.dart' as path; diff --git a/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart b/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart index add730b0d24..fe654902d58 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Code generation for the file "integration_test_methods.dart". -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart' as path; import 'api.dart'; diff --git a/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart b/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart index 00110bcb1e6..9e3e2fdfed0 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Code generation for the file "matchers.dart". -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'api.dart'; import 'from_html.dart'; diff --git a/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart b/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart index ae017a69028..099eb1d5080 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.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:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart' as path; import 'api.dart'; diff --git a/pkg/analyzer_plugin/tool/spec/codegen_protocol_constants.dart b/pkg/analyzer_plugin/tool/spec/codegen_protocol_constants.dart index 2c6718ff097..52618acdf99 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_protocol_constants.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_protocol_constants.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:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'api.dart'; import 'codegen_dart.dart'; diff --git a/pkg/analyzer_plugin/tool/spec/from_html.dart b/pkg/analyzer_plugin/tool/spec/from_html.dart index 86d0ebbf213..977737bc3d6 100644 --- a/pkg/analyzer_plugin/tool/spec/from_html.dart +++ b/pkg/analyzer_plugin/tool/spec/from_html.dart @@ -5,7 +5,7 @@ /// Code for reading an HTML API description. import 'dart:io'; -import 'package:analysis_tool/html.dart'; +import 'package:analyzer_utilities/html.dart'; import 'package:html/dom.dart' as dom; import 'package:html/parser.dart' as parser; import 'package:path/path.dart'; diff --git a/pkg/analyzer_plugin/tool/spec/generate_all.dart b/pkg/analyzer_plugin/tool/spec/generate_all.dart index 4083370bd39..5375f428f22 100644 --- a/pkg/analyzer_plugin/tool/spec/generate_all.dart +++ b/pkg/analyzer_plugin/tool/spec/generate_all.dart @@ -4,7 +4,7 @@ import 'dart:io'; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'codegen_dart_protocol.dart' as codegen_dart_protocol; diff --git a/pkg/analyzer_plugin/tool/spec/implied_types.dart b/pkg/analyzer_plugin/tool/spec/implied_types.dart index 0eb3e4b8fca..04f217c2f91 100644 --- a/pkg/analyzer_plugin/tool/spec/implied_types.dart +++ b/pkg/analyzer_plugin/tool/spec/implied_types.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. /// Code for enumerating the set of types implied by the API. -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'api.dart'; diff --git a/pkg/analyzer_plugin/tool/spec/to_html.dart b/pkg/analyzer_plugin/tool/spec/to_html.dart index 115b3ec1a89..923e34bde27 100644 --- a/pkg/analyzer_plugin/tool/spec/to_html.dart +++ b/pkg/analyzer_plugin/tool/spec/to_html.dart @@ -7,8 +7,8 @@ /// in generated code. import 'dart:convert'; -import 'package:analysis_tool/html.dart'; -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/html.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:html/dom.dart' as dom; import 'api.dart'; diff --git a/pkg/analysis_tool/README.md b/pkg/analyzer_utilities/README.md similarity index 100% rename from pkg/analysis_tool/README.md rename to pkg/analyzer_utilities/README.md diff --git a/pkg/analysis_tool/analysis_options.yaml b/pkg/analyzer_utilities/analysis_options.yaml similarity index 100% rename from pkg/analysis_tool/analysis_options.yaml rename to pkg/analyzer_utilities/analysis_options.yaml diff --git a/pkg/analysis_tool/lib/html.dart b/pkg/analyzer_utilities/lib/html.dart similarity index 100% rename from pkg/analysis_tool/lib/html.dart rename to pkg/analyzer_utilities/lib/html.dart diff --git a/pkg/analysis_tool/lib/package_root.dart b/pkg/analyzer_utilities/lib/package_root.dart similarity index 100% rename from pkg/analysis_tool/lib/package_root.dart rename to pkg/analyzer_utilities/lib/package_root.dart diff --git a/pkg/analysis_tool/lib/text_formatter.dart b/pkg/analyzer_utilities/lib/text_formatter.dart similarity index 99% rename from pkg/analysis_tool/lib/text_formatter.dart rename to pkg/analyzer_utilities/lib/text_formatter.dart index 2305910cab2..a35920be253 100644 --- a/pkg/analysis_tool/lib/text_formatter.dart +++ b/pkg/analyzer_utilities/lib/text_formatter.dart @@ -7,7 +7,7 @@ * analyzer and analysis server. */ -import 'package:analysis_tool/tools.dart'; +import 'package:analyzer_utilities/tools.dart'; import 'package:html/dom.dart' as dom; final RegExp whitespace = new RegExp(r'\s'); diff --git a/pkg/analysis_tool/lib/tools.dart b/pkg/analyzer_utilities/lib/tools.dart similarity index 99% rename from pkg/analysis_tool/lib/tools.dart rename to pkg/analyzer_utilities/lib/tools.dart index 831014e0190..c26e5a56593 100644 --- a/pkg/analysis_tool/lib/tools.dart +++ b/pkg/analyzer_utilities/lib/tools.dart @@ -8,8 +8,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:analysis_tool/html.dart'; -import 'package:analysis_tool/text_formatter.dart'; +import 'package:analyzer_utilities/html.dart'; +import 'package:analyzer_utilities/text_formatter.dart'; import 'package:html/dom.dart' as dom; import 'package:path/path.dart'; diff --git a/pkg/analysis_tool/lib/verify_tests.dart b/pkg/analyzer_utilities/lib/verify_tests.dart similarity index 100% rename from pkg/analysis_tool/lib/verify_tests.dart rename to pkg/analyzer_utilities/lib/verify_tests.dart diff --git a/pkg/analysis_tool/pubspec.yaml b/pkg/analyzer_utilities/pubspec.yaml similarity index 88% rename from pkg/analysis_tool/pubspec.yaml rename to pkg/analyzer_utilities/pubspec.yaml index f4763fd323c..ed67a420b60 100644 --- a/pkg/analysis_tool/pubspec.yaml +++ b/pkg/analyzer_utilities/pubspec.yaml @@ -1,4 +1,4 @@ -name: analysis_tool +name: analyzer_utilities # This package is not intended for consumption on pub.dev. DO NOT publish. publish_to: none diff --git a/pkg/nnbd_migration/pubspec.yaml b/pkg/nnbd_migration/pubspec.yaml index 59072b4b267..7917b785013 100644 --- a/pkg/nnbd_migration/pubspec.yaml +++ b/pkg/nnbd_migration/pubspec.yaml @@ -21,8 +21,8 @@ dependencies: yaml: ^2.1.15 dev_dependencies: - analysis_tool: - path: ../analysis_tool + analyzer_utilities: + path: ../analyzer_utilities http: '>=0.11.3+17 <0.13.0' pedantic: ^1.9.0 test: ^1.6.4 diff --git a/pkg/nnbd_migration/test/verify_tests_test.dart b/pkg/nnbd_migration/test/verify_tests_test.dart index af190885a64..654c634d6ef 100644 --- a/pkg/nnbd_migration/test/verify_tests_test.dart +++ b/pkg/nnbd_migration/test/verify_tests_test.dart @@ -2,8 +2,8 @@ // 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:analysis_tool/package_root.dart' as package_root; -import 'package:analysis_tool/verify_tests.dart'; +import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_utilities/verify_tests.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; void main() { diff --git a/pkg/nnbd_migration/tool/steamroll_ecosystem.sh b/pkg/nnbd_migration/tool/steamroll_ecosystem.sh index 9af39268250..0c6374b0bb3 100755 --- a/pkg/nnbd_migration/tool/steamroll_ecosystem.sh +++ b/pkg/nnbd_migration/tool/steamroll_ecosystem.sh @@ -276,8 +276,8 @@ function add_package_to_workspace { case "${package_name}" in _fe_analyzer_shared) repo=sdk make_clone_from_package _fe_analyzer_shared "${repo}" master pkg/_fe_analyzer_shared ;; - analysis_tool) repo=sdk - make_clone_from_package analysis_tool "${repo}" master pkg/analysis_tool ;; + analyzer_utilities) repo=sdk + make_clone_from_package analyzer_utilities "${repo}" master pkg/analyzer_utilities ;; analyzer) repo=sdk make_clone_from_package analyzer "${repo}" master pkg/analyzer ;; build) repo=build @@ -379,7 +379,7 @@ function add_package_to_workspace { # those here. case "${package_name}" in analyzer) - add_package_to_workspace "analysis_tool" + add_package_to_workspace "analyzer_utilities" ;; esac if [ -n "${NO_UPDATE}" ] || repo_changed_this_run "${repo}" ; then @@ -447,4 +447,4 @@ function main { } -main "$@" \ No newline at end of file +main "$@"