diff --git a/pkg/analysis_server/benchmark/benchmarks.dart b/pkg/analysis_server/benchmark/benchmarks.dart index 6d1c604e098..a21d18c5109 100644 --- a/pkg/analysis_server/benchmark/benchmarks.dart +++ b/pkg/analysis_server/benchmark/benchmarks.dart @@ -11,7 +11,7 @@ import 'dart:io'; import 'dart:math' as math; import 'package:analyzer/file_system/physical_file_system.dart'; -import 'package:analyzer_utilities/package_root.dart'; +import 'package:analyzer_testing/package_root.dart'; import 'package:args/command_runner.dart'; import 'package:path/path.dart' as path; diff --git a/pkg/analysis_server/benchmark/perf/dart_analyze.dart b/pkg/analysis_server/benchmark/perf/dart_analyze.dart index 17b71851299..031fafb74b5 100644 --- a/pkg/analysis_server/benchmark/perf/dart_analyze.dart +++ b/pkg/analysis_server/benchmark/perf/dart_analyze.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:analyzer_utilities/package_root.dart'; +import 'package:analyzer_testing/package_root.dart'; import '../benchmarks.dart'; import 'utils.dart'; diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml index 6b792b7062b..407f4f343cd 100644 --- a/pkg/analysis_server/pubspec.yaml +++ b/pkg/analysis_server/pubspec.yaml @@ -37,6 +37,7 @@ dependencies: # Use 'any' constraints here; we get our versions from the DEPS file. dev_dependencies: + analyzer_testing: any analyzer_utilities: any cli_util: any lints: any diff --git a/pkg/analysis_server/test/benchmarks_test.dart b/pkg/analysis_server/test/benchmarks_test.dart index 69b20b0bcee..686ba843212 100644 --- a/pkg/analysis_server/test/benchmarks_test.dart +++ b/pkg/analysis_server/test/benchmarks_test.dart @@ -9,7 +9,7 @@ library; import 'dart:convert'; import 'dart:io'; -import 'package:analyzer_utilities/package_root.dart'; +import 'package:analyzer_testing/package_root.dart'; import 'package:path/path.dart' as path; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/src/utilities/selection_coverage_test.dart b/pkg/analysis_server/test/src/utilities/selection_coverage_test.dart index 92eeffb2464..d770fd0ea73 100644 --- a/pkg/analysis_server/test/src/utilities/selection_coverage_test.dart +++ b/pkg/analysis_server/test/src/utilities/selection_coverage_test.dart @@ -9,7 +9,7 @@ import 'package:analyzer/dart/ast/visitor.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/dart/element/inheritance_manager3.dart'; -import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_testing/package_root.dart' as package_root; import 'package:test/test.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 5edb780fe3b..b2ae8f6623b 100644 --- a/pkg/analysis_server/test/support/configuration_files.dart +++ b/pkg/analysis_server/test/support/configuration_files.dart @@ -8,7 +8,7 @@ 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_root.dart' as package_root; +import 'package:analyzer_testing/package_root.dart' as package_root; import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; /// A mixin adding functionality to write `.dart_tool/package_config.json` diff --git a/pkg/analysis_server/test/verify_no_utf8_encode_test.dart b/pkg/analysis_server/test/verify_no_utf8_encode_test.dart index 6d5e5348311..1f4d08f807e 100644 --- a/pkg/analysis_server/test/verify_no_utf8_encode_test.dart +++ b/pkg/analysis_server/test/verify_no_utf8_encode_test.dart @@ -7,7 +7,7 @@ import 'dart:collection'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; -import 'package:analyzer_utilities/package_root.dart'; +import 'package:analyzer_testing/package_root.dart'; import 'package:test/test.dart'; // TODO(scheglov): Remove it after SDK 3.1 published. diff --git a/pkg/analysis_server/test/verify_sorted_test.dart b/pkg/analysis_server/test/verify_sorted_test.dart index 93fc172060c..4b949252590 100644 --- a/pkg/analysis_server/test/verify_sorted_test.dart +++ b/pkg/analysis_server/test/verify_sorted_test.dart @@ -8,7 +8,7 @@ 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:analyzer_testing/package_root.dart'; import 'package:test/test.dart'; /// The purpose of this test is to validate that all elements diff --git a/pkg/analysis_server/test/verify_tests_test.dart b/pkg/analysis_server/test/verify_tests_test.dart index 3f7c4c9bb6c..0f29d6e32d8 100644 --- a/pkg/analysis_server/test/verify_tests_test.dart +++ b/pkg/analysis_server/test/verify_tests_test.dart @@ -4,7 +4,7 @@ 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_testing/package_root.dart' as package_root; import 'package:analyzer_utilities/verify_tests.dart'; import 'package:path/path.dart' as path; diff --git a/pkg/analysis_server/tool/bulk_fix/parse_utils.dart b/pkg/analysis_server/tool/bulk_fix/parse_utils.dart index 91549b8ebf9..b3a337f688d 100644 --- a/pkg/analysis_server/tool/bulk_fix/parse_utils.dart +++ b/pkg/analysis_server/tool/bulk_fix/parse_utils.dart @@ -8,7 +8,7 @@ import 'package:analyzer/dart/analysis/analysis_context_collection.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; -import 'package:analyzer_utilities/package_root.dart'; +import 'package:analyzer_testing/package_root.dart'; class BulkFixDetails { Future> collectOverrides() async { diff --git a/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart b/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart index 83bc4e53128..a178c857ac4 100644 --- a/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart +++ b/pkg/analysis_server/tool/code_completion/relevance_table_generator.dart @@ -24,7 +24,7 @@ import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/dart/element/inheritance_manager3.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer/src/utilities/extensions/flutter.dart'; -import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_testing/package_root.dart' as package_root; import 'package:analyzer_utilities/tools.dart'; import 'package:args/args.dart'; diff --git a/pkg/analysis_server/tool/codebase/failing_tests.dart b/pkg/analysis_server/tool/codebase/failing_tests.dart index 6f3e0363a95..5eae7392406 100644 --- a/pkg/analysis_server/tool/codebase/failing_tests.dart +++ b/pkg/analysis_server/tool/codebase/failing_tests.dart @@ -11,7 +11,7 @@ import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/ast/visitor.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:analyzer_testing/package_root.dart'; import 'package:http/http.dart' as http; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/tool/generate_analyzer_version.dart b/pkg/analysis_server/tool/generate_analyzer_version.dart index 82325b66d0c..cbceb647d30 100644 --- a/pkg/analysis_server/tool/generate_analyzer_version.dart +++ b/pkg/analysis_server/tool/generate_analyzer_version.dart @@ -4,7 +4,7 @@ import 'dart:io'; -import 'package:analyzer_utilities/package_root.dart'; +import 'package:analyzer_testing/package_root.dart'; import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; import 'package:yaml/yaml.dart'; diff --git a/pkg/analysis_server/tool/presubmit/verify_error_fix_status.dart b/pkg/analysis_server/tool/presubmit/verify_error_fix_status.dart index 43c05003318..ac574687f68 100644 --- a/pkg/analysis_server/tool/presubmit/verify_error_fix_status.dart +++ b/pkg/analysis_server/tool/presubmit/verify_error_fix_status.dart @@ -11,7 +11,7 @@ import 'package:analysis_server_plugin/src/correction/fix_generators.dart'; import 'package:analyzer/error/error.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/lint/registry.dart'; -import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_testing/package_root.dart' as package_root; import 'package:linter/src/rules.dart'; import 'package:yaml/yaml.dart'; diff --git a/pkg/analyzer/pubspec.yaml b/pkg/analyzer/pubspec.yaml index 6778abf180c..e7068b4a714 100644 --- a/pkg/analyzer/pubspec.yaml +++ b/pkg/analyzer/pubspec.yaml @@ -28,6 +28,7 @@ dependencies: # best practice for packages is to specify their compatible version ranges. # See also https://dart.dev/tools/pub/dependencies. dev_dependencies: + analyzer_testing: any analyzer_utilities: any args: any async: any diff --git a/pkg/analyzer/test/src/fasta/message_coverage_test.dart b/pkg/analyzer/test/src/fasta/message_coverage_test.dart index 55bf9dab7e5..7d5e6a0721f 100644 --- a/pkg/analyzer/test/src/fasta/message_coverage_test.dart +++ b/pkg/analyzer/test/src/fasta/message_coverage_test.dart @@ -6,7 +6,7 @@ import 'dart:io' as io; 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:analyzer_testing/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/verify_docs_test.dart b/pkg/analyzer/test/verify_docs_test.dart index 136415e8ded..14f7f7c9eee 100644 --- a/pkg/analyzer/test/verify_docs_test.dart +++ b/pkg/analyzer/test/verify_docs_test.dart @@ -12,7 +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:analyzer_testing/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 deca8ad9bac..14adaf590d7 100644 --- a/pkg/analyzer/test/verify_tests_test.dart +++ b/pkg/analyzer/test/verify_tests_test.dart @@ -4,7 +4,7 @@ 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_testing/package_root.dart' as package_root; import 'package:analyzer_utilities/verify_tests.dart'; import 'package:path/path.dart' as path; diff --git a/pkg/analyzer/tool/api/generate.dart b/pkg/analyzer/tool/api/generate.dart index 76a533f32cc..aa99d5b7e57 100644 --- a/pkg/analyzer/tool/api/generate.dart +++ b/pkg/analyzer/tool/api/generate.dart @@ -16,8 +16,8 @@ import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:analyzer/dart/element/type.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/utilities/extensions/element.dart'; -import 'package:analyzer_utilities/package_root.dart' as pkg_root; -import 'package:analyzer_utilities/package_root.dart'; +import 'package:analyzer_testing/package_root.dart' as pkg_root; +import 'package:analyzer_testing/package_root.dart'; import 'package:analyzer_utilities/tools.dart'; import 'package:collection/collection.dart'; import 'package:path/path.dart'; diff --git a/pkg/analyzer/tool/benchmark/heap/flutter_elements.dart b/pkg/analyzer/tool/benchmark/heap/flutter_elements.dart index ef4b057719c..753a5cfeed0 100644 --- a/pkg/analyzer/tool/benchmark/heap/flutter_elements.dart +++ b/pkg/analyzer/tool/benchmark/heap/flutter_elements.dart @@ -15,7 +15,7 @@ import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart'; import 'package:analyzer/src/dart/analysis/byte_store.dart'; import 'package:analyzer/src/dart/analysis/file_content_cache.dart'; import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart'; -import 'package:analyzer_utilities/package_root.dart'; +import 'package:analyzer_testing/package_root.dart'; import 'package:args/args.dart'; import 'package:heap_snapshot/analysis.dart'; import 'package:heap_snapshot/format.dart'; diff --git a/pkg/analyzer/tool/experiments/generate.dart b/pkg/analyzer/tool/experiments/generate.dart index 617aca94a2f..a3bda02aa21 100644 --- a/pkg/analyzer/tool/experiments/generate.dart +++ b/pkg/analyzer/tool/experiments/generate.dart @@ -6,7 +6,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/scanner/characters.dart' show $MINUS, $_; -import 'package:analyzer_utilities/package_root.dart' as pkg_root; +import 'package:analyzer_testing/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/error_code_info.dart b/pkg/analyzer/tool/messages/error_code_info.dart index 2b177f85f80..0ec82023b9c 100644 --- a/pkg/analyzer/tool/messages/error_code_info.dart +++ b/pkg/analyzer/tool/messages/error_code_info.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:analyzer_utilities/package_root.dart' as pkg_root; +import 'package:analyzer_testing/package_root.dart' as pkg_root; import 'package:path/path.dart'; import 'package:yaml/yaml.dart' show loadYaml; diff --git a/pkg/analyzer/tool/messages/extract_errors_to_yaml.dart b/pkg/analyzer/tool/messages/extract_errors_to_yaml.dart index e95be80f1aa..d8105b40381 100644 --- a/pkg/analyzer/tool/messages/extract_errors_to_yaml.dart +++ b/pkg/analyzer/tool/messages/extract_errors_to_yaml.dart @@ -18,7 +18,7 @@ import 'package:analyzer/error/error.dart'; import 'package:analyzer/src/dart/ast/token.dart'; import 'package:analyzer/src/dart/error/todo_codes.dart'; import 'package:analyzer/src/generated/parser.dart'; -import 'package:analyzer_utilities/package_root.dart' as pkg_root; +import 'package:analyzer_testing/package_root.dart' as pkg_root; import 'package:path/path.dart'; import 'package:yaml/yaml.dart'; diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart index 499f846b5a3..a240c4b1a91 100644 --- a/pkg/analyzer/tool/messages/generate.dart +++ b/pkg/analyzer/tool/messages/generate.dart @@ -20,7 +20,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:_fe_analyzer_shared/src/scanner/scanner.dart'; -import 'package:analyzer_utilities/package_root.dart' as pkg_root; +import 'package:analyzer_testing/package_root.dart' as pkg_root; import 'package:analyzer_utilities/tools.dart'; import 'package:collection/collection.dart'; import 'package:path/path.dart'; diff --git a/pkg/analyzer/tool/summary/check_test.dart b/pkg/analyzer/tool/summary/check_test.dart index 4c9e87eca2f..14f0eaeeeb0 100644 --- a/pkg/analyzer/tool/summary/check_test.dart +++ b/pkg/analyzer/tool/summary/check_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_utilities/package_root.dart' as package_root; +import 'package:analyzer_testing/package_root.dart' as package_root; import 'package:analyzer_utilities/tools.dart'; import 'package:path/path.dart'; diff --git a/pkg/analyzer/tool/wolf/generate.dart b/pkg/analyzer/tool/wolf/generate.dart index 876c24c3203..c16d3b790f3 100644 --- a/pkg/analyzer/tool/wolf/generate.dart +++ b/pkg/analyzer/tool/wolf/generate.dart @@ -4,7 +4,7 @@ import 'dart:convert'; -import 'package:analyzer_utilities/package_root.dart' as pkg_root; +import 'package:analyzer_testing/package_root.dart' as pkg_root; import 'package:analyzer_utilities/tools.dart'; import 'package:collection/collection.dart'; import 'package:path/path.dart'; diff --git a/pkg/analyzer_plugin/pubspec.yaml b/pkg/analyzer_plugin/pubspec.yaml index 986f60d20f9..e0c79dd8d9e 100644 --- a/pkg/analyzer_plugin/pubspec.yaml +++ b/pkg/analyzer_plugin/pubspec.yaml @@ -21,6 +21,7 @@ dependencies: # best practice for packages is to specify their compatible version ranges. # See also https://dart.dev/tools/pub/dependencies. dev_dependencies: + analyzer_testing: any analyzer_utilities: any lints: any linter: any diff --git a/pkg/analyzer_plugin/test/verify_tests_test.dart b/pkg/analyzer_plugin/test/verify_tests_test.dart index 1218879166b..1e798cab017 100644 --- a/pkg/analyzer_plugin/test/verify_tests_test.dart +++ b/pkg/analyzer_plugin/test/verify_tests_test.dart @@ -4,7 +4,7 @@ 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_testing/package_root.dart' as package_root; import 'package:analyzer_utilities/verify_tests.dart'; void main() { diff --git a/pkg/analyzer_testing/OWNERS b/pkg/analyzer_testing/OWNERS new file mode 100644 index 00000000000..711393e04e2 --- /dev/null +++ b/pkg/analyzer_testing/OWNERS @@ -0,0 +1,2 @@ +file:/tools/OWNERS_DEVELOPER_EXPERIENCE +file:/tools/OWNERS_MODEL diff --git a/pkg/analyzer_utilities/lib/package_root.dart b/pkg/analyzer_testing/lib/package_root.dart similarity index 68% rename from pkg/analyzer_utilities/lib/package_root.dart rename to pkg/analyzer_testing/lib/package_root.dart index c799ac054c3..923ff8a8678 100644 --- a/pkg/analyzer_utilities/lib/package_root.dart +++ b/pkg/analyzer_testing/lib/package_root.dart @@ -4,34 +4,34 @@ import 'dart:io'; -import 'package:path/path.dart' as pathos; +import 'package:path/path.dart' as path; /// Returns a path to the directory containing source code for packages such as /// kernel, front_end, and analyzer. String get packageRoot { // If the package root directory is specified on the command line using - // -DpkgRoot=..., use it. + // `-DpkgRoot=...`, use that. const pkgRootVar = bool.hasEnvironment('pkgRoot') ? String.fromEnvironment('pkgRoot') : null; if (pkgRootVar != null) { - var path = pathos.join(Directory.current.path, pkgRootVar); - if (!path.endsWith(pathos.separator)) path += pathos.separator; - return path; + var pkgRootPath = path.join(Directory.current.path, pkgRootVar); + if (!pkgRootPath.endsWith(path.separator)) pkgRootPath += path.separator; + return pkgRootPath; } // Otherwise try to guess based on the script path. - var scriptPath = pathos.fromUri(Platform.script); + var scriptPath = path.fromUri(Platform.script); var pathFromScript = _tryGetPkgRoot(scriptPath); if (pathFromScript != null) { return pathFromScript; } - // Try google3 environment. We expect that all packages that will be + // Try a Bazel environment. We expect that all packages that will be // accessed via this root are configured in the BUILD file, and located // inside this single root. var runFiles = Platform.environment['TEST_SRCDIR']; var analyzerPackagesRoot = Platform.environment['ANALYZER_PACKAGES_ROOT']; if (runFiles != null && analyzerPackagesRoot != null) { - return pathos.join(runFiles, analyzerPackagesRoot); + return path.join(runFiles, analyzerPackagesRoot); } // Finally, try the current working directory. @@ -43,12 +43,12 @@ String get packageRoot { throw StateError('Unable to find sdk/pkg/ in $scriptPath'); } -/// Try to find the path to the pkg folder from [path]. -String? _tryGetPkgRoot(String path) { - var parts = pathos.split(path); +/// Tries to find the path to the 'pkg' folder from [searchPath]. +String? _tryGetPkgRoot(String searchPath) { + var parts = path.split(searchPath); var pkgIndex = parts.indexOf('pkg'); if (pkgIndex != -1) { - return pathos.joinAll(parts.sublist(0, pkgIndex + 1)) + pathos.separator; + return path.joinAll(parts.sublist(0, pkgIndex + 1)) + path.separator; } return null; } diff --git a/pkg/analyzer_testing/pubspec.yaml b/pkg/analyzer_testing/pubspec.yaml index 7814c0ad964..d3d6c293da0 100644 --- a/pkg/analyzer_testing/pubspec.yaml +++ b/pkg/analyzer_testing/pubspec.yaml @@ -4,3 +4,13 @@ environment: sdk: ^3.7.0 resolution: workspace + +dependencies: + path: ^1.9.0 + +# We use 'any' version constraints here as we get our package versions from +# the dart-lang/sdk repo's DEPS file. Note that this is a special case; the +# best practice for packages is to specify their compatible version ranges. +# See also https://dart.dev/tools/pub/dependencies. +dev_dependencies: + lints: any diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart b/pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart index 965289939ee..2c01812b24a 100644 --- a/pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart +++ b/pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart @@ -6,7 +6,7 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; // ignore: implementation_imports import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; -import 'package:analyzer_utilities/package_root.dart' as package_root; +import 'package:analyzer_testing/package_root.dart' as package_root; import 'package:path/path.dart' as path; void _cacheFiles(Map cachedFiles) { diff --git a/pkg/analyzer_utilities/pubspec.yaml b/pkg/analyzer_utilities/pubspec.yaml index a4a2d7aaa3b..38453699076 100644 --- a/pkg/analyzer_utilities/pubspec.yaml +++ b/pkg/analyzer_utilities/pubspec.yaml @@ -9,6 +9,7 @@ resolution: workspace # Use 'any' constraints here; we get our versions from the DEPS file. dependencies: + analyzer_testing: any analyzer: any dart_style: any package_config: any