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 <paulberry@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

.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",

.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

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

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 {

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';
 

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;

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';
 

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';

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';

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';

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;
 

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';

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';

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';

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';

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';

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';

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;

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';
 

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';

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

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() {

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

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';

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';

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 {

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;

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

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';

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;
 

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;
 

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';

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';

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

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;

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';

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;
 

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';

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';

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';

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';

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';

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;

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';
 

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';

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');

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';
 

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
 

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

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() {

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 "$@"
+main "$@"