From ca4978e36367a838fb6a474d1df39efa4365405a Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Thu, 31 Jan 2019 16:52:05 +0000 Subject: [PATCH] Add pkg:analysis_tool as an SDK-only set of utils Reduces the API surface of pkg:analyzer that requires pkg:html Related to https://github.com/dart-lang/sdk/issues/35802 Change-Id: Icd08d76190d6ab77cd180561cdde6df254b22557 Reviewed-on: https://dart-review.googlesource.com/c/91701 Reviewed-by: Brian Wilkerson Commit-Queue: Kevin Moore --- .packages | 1 + 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 +- pkg/analysis_server/tool/spec/codegen_dart_protocol.dart | 2 +- .../tool/spec/codegen_inttest_methods.dart | 2 +- pkg/analysis_server/tool/spec/codegen_java.dart | 2 +- pkg/analysis_server/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 | 6 +++--- 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_tool/README.md | 3 +++ .../lib/src/codegen => analysis_tool/lib}/html.dart | 0 .../codegen => analysis_tool/lib}/text_formatter.dart | 3 ++- .../lib/src/codegen => analysis_tool/lib}/tools.dart | 4 ++-- pkg/analysis_tool/pubspec.yaml | 9 +++++++++ pkg/analyzer/pubspec.yaml | 2 ++ pkg/analyzer/tool/messages/generate.dart | 2 +- pkg/analyzer/tool/summary/check_test.dart | 2 +- pkg/analyzer/tool/summary/generate.dart | 2 +- pkg/analyzer/tool/task_dependency_graph/check_test.dart | 2 +- pkg/analyzer/tool/task_dependency_graph/generate.dart | 2 +- pkg/analyzer_plugin/pubspec.yaml | 2 ++ pkg/analyzer_plugin/tool/spec/check_all_test.dart | 2 +- pkg/analyzer_plugin/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 ++-- 36 files changed, 53 insertions(+), 35 deletions(-) create mode 100644 pkg/analysis_tool/README.md rename pkg/{analyzer/lib/src/codegen => analysis_tool/lib}/html.dart (100%) rename pkg/{analyzer/lib/src/codegen => analysis_tool/lib}/text_formatter.dart (99%) rename pkg/{analyzer/lib/src/codegen => analysis_tool/lib}/tools.dart (99%) create mode 100644 pkg/analysis_tool/pubspec.yaml diff --git a/.packages b/.packages index 9d7e75690b0..a686ef238f6 100644 --- a/.packages +++ b/.packages @@ -8,6 +8,7 @@ # 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_fe_comparison:pkg/analyzer_fe_comparison/lib diff --git a/pkg/analysis_server/tool/spec/check_all_test.dart b/pkg/analysis_server/tool/spec/check_all_test.dart index 3aefa259628..13886529102 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 75fc69ce0f5..d81e94c05a7 100644 --- a/pkg/analysis_server/tool/spec/codegen_analysis_server.dart +++ b/pkg/analysis_server/tool/spec/codegen_analysis_server.dart @@ -5,7 +5,7 @@ /** * Code generation for the file "AnalysisServer.java". */ -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 45c8f2e62a7..6acbda19b1c 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 adb57f7ec91..a8692f13827 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 8fec4fad034..924e5c355fd 100644 --- a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart +++ b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart @@ -7,7 +7,7 @@ */ import 'dart:convert'; -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 9956fe166b8..56bdc8be9cf 100644 --- a/pkg/analysis_server/tool/spec/codegen_java.dart +++ b/pkg/analysis_server/tool/spec/codegen_java.dart @@ -5,7 +5,7 @@ /** * Tools for Java code generation. */ -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 2006405fbe9..5a0e44357e9 100644 --- a/pkg/analysis_server/tool/spec/codegen_java_types.dart +++ b/pkg/analysis_server/tool/spec/codegen_java_types.dart @@ -5,7 +5,7 @@ /** * Code generation for the file "AnalysisServer.java". */ -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 226c7079cfe..bd6c7e153d9 100644 --- a/pkg/analysis_server/tool/spec/codegen_matchers.dart +++ b/pkg/analysis_server/tool/spec/codegen_matchers.dart @@ -7,7 +7,7 @@ */ import 'dart:convert'; -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 7530d392c71..4c4533194c7 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 be77a029678..f78ad633ea0 100644 --- a/pkg/analysis_server/tool/spec/from_html.dart +++ b/pkg/analysis_server/tool/spec/from_html.dart @@ -7,7 +7,7 @@ */ import 'dart:io'; -import 'package:analyzer/src/codegen/html.dart'; +import 'package:analysis_tool/html.dart'; import 'package:html/dom.dart' as dom; import 'package:html/parser.dart' as parser; import 'package:path/path.dart'; @@ -131,8 +131,8 @@ class ApiReader { }); for (String expectedAttribute in requiredAttributes) { if (!attributesFound.contains(expectedAttribute)) { - throw new Exception('$context: ${element - .localName} must contain attribute $expectedAttribute'); + throw new Exception( + '$context: ${element.localName} must contain attribute $expectedAttribute'); } } } diff --git a/pkg/analysis_server/tool/spec/generate_all.dart b/pkg/analysis_server/tool/spec/generate_all.dart index c5afd227488..000b487c9b0 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 856b2a417b3..2cf1c8bdbe4 100644 --- a/pkg/analysis_server/tool/spec/implied_types.dart +++ b/pkg/analysis_server/tool/spec/implied_types.dart @@ -5,7 +5,7 @@ /** * Code for enumerating the set of types implied by the API. */ -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 1683331e6c6..820948c4660 100644 --- a/pkg/analysis_server/tool/spec/to_html.dart +++ b/pkg/analysis_server/tool/spec/to_html.dart @@ -9,8 +9,8 @@ */ import 'dart:convert'; -import 'package:analyzer/src/codegen/html.dart'; -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/html.dart'; +import 'package:analysis_tool/tools.dart'; import 'package:html/dom.dart' as dom; import 'api.dart'; diff --git a/pkg/analysis_tool/README.md b/pkg/analysis_tool/README.md new file mode 100644 index 00000000000..c94b407f501 --- /dev/null +++ b/pkg/analysis_tool/README.md @@ -0,0 +1,3 @@ +A set of utilities used by the tools in several analyzer-related packages. + +Not meant to be published. diff --git a/pkg/analyzer/lib/src/codegen/html.dart b/pkg/analysis_tool/lib/html.dart similarity index 100% rename from pkg/analyzer/lib/src/codegen/html.dart rename to pkg/analysis_tool/lib/html.dart diff --git a/pkg/analyzer/lib/src/codegen/text_formatter.dart b/pkg/analysis_tool/lib/text_formatter.dart similarity index 99% rename from pkg/analyzer/lib/src/codegen/text_formatter.dart rename to pkg/analysis_tool/lib/text_formatter.dart index 0ffad911ed8..2305910cab2 100644 --- a/pkg/analyzer/lib/src/codegen/text_formatter.dart +++ b/pkg/analysis_tool/lib/text_formatter.dart @@ -6,7 +6,8 @@ * Code for converting HTML into text, for use during code generation of * analyzer and analysis server. */ -import 'package:analyzer/src/codegen/tools.dart'; + +import 'package:analysis_tool/tools.dart'; import 'package:html/dom.dart' as dom; final RegExp whitespace = new RegExp(r'\s'); diff --git a/pkg/analyzer/lib/src/codegen/tools.dart b/pkg/analysis_tool/lib/tools.dart similarity index 99% rename from pkg/analyzer/lib/src/codegen/tools.dart rename to pkg/analysis_tool/lib/tools.dart index 8b4e96d01f1..0e35b610e64 100644 --- a/pkg/analyzer/lib/src/codegen/tools.dart +++ b/pkg/analysis_tool/lib/tools.dart @@ -8,8 +8,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:analyzer/src/codegen/html.dart'; -import 'package:analyzer/src/codegen/text_formatter.dart'; +import 'package:analysis_tool/html.dart'; +import 'package:analysis_tool/text_formatter.dart'; import 'package:html/dom.dart' as dom; import 'package:path/path.dart'; diff --git a/pkg/analysis_tool/pubspec.yaml b/pkg/analysis_tool/pubspec.yaml new file mode 100644 index 00000000000..57ab3eeaf4f --- /dev/null +++ b/pkg/analysis_tool/pubspec.yaml @@ -0,0 +1,9 @@ +name: analysis_tool +publish_to: none + +environment: + sdk: '>=2.1.0 <3.0.0' + +dependencies: + html: any + path: any diff --git a/pkg/analyzer/pubspec.yaml b/pkg/analyzer/pubspec.yaml index 73904b4114c..a06648a2547 100644 --- a/pkg/analyzer/pubspec.yaml +++ b/pkg/analyzer/pubspec.yaml @@ -24,5 +24,7 @@ dependencies: watcher: '>=0.9.6 <0.10.0' yaml: ^2.1.2 dev_dependencies: + analysis_tool: + path: ../analysis_tool test: ^1.0.0 test_reflective_loader: ^0.1.8 diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart index b0e7c53a951..a88a897a693 100644 --- a/pkg/analyzer/tool/messages/generate.dart +++ b/pkg/analyzer/tool/messages/generate.dart @@ -15,7 +15,7 @@ import 'dart:io'; import 'package:analyzer/error/error.dart'; -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/tools.dart'; import 'package:analyzer/src/dart/error/syntactic_errors.dart'; import 'package:front_end/src/testing/package_root.dart' as pkgRoot; import 'package:front_end/src/fasta/scanner.dart'; diff --git a/pkg/analyzer/tool/summary/check_test.dart b/pkg/analyzer/tool/summary/check_test.dart index c7ddf9e17a0..ff689ba9234 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/src/codegen/tools.dart'; +import 'package:analysis_tool/tools.dart'; import 'package:front_end/src/testing/package_root.dart' as package_root; import 'package:path/path.dart'; diff --git a/pkg/analyzer/tool/summary/generate.dart b/pkg/analyzer/tool/summary/generate.dart index d99b76ac12d..d4d5157436d 100644 --- a/pkg/analyzer/tool/summary/generate.dart +++ b/pkg/analyzer/tool/summary/generate.dart @@ -20,7 +20,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/tools.dart'; import 'package:analyzer/src/dart/analysis/experiments.dart'; import 'package:front_end/src/fasta/scanner/string_scanner.dart'; import 'package:front_end/src/scanner/token.dart' show Token; diff --git a/pkg/analyzer/tool/task_dependency_graph/check_test.dart b/pkg/analyzer/tool/task_dependency_graph/check_test.dart index 3452f409d02..efc365db43f 100644 --- a/pkg/analyzer/tool/task_dependency_graph/check_test.dart +++ b/pkg/analyzer/tool/task_dependency_graph/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/src/codegen/tools.dart'; +import 'package:analysis_tool/tools.dart'; import 'package:front_end/src/testing/package_root.dart' as package_root; import 'package:path/path.dart'; diff --git a/pkg/analyzer/tool/task_dependency_graph/generate.dart b/pkg/analyzer/tool/task_dependency_graph/generate.dart index 3a9aa7bed76..da4e3a9fcb1 100644 --- a/pkg/analyzer/tool/task_dependency_graph/generate.dart +++ b/pkg/analyzer/tool/task_dependency_graph/generate.dart @@ -19,13 +19,13 @@ import 'dart:async'; import 'dart:io' hide File; import 'dart:io' as io; +import 'package:analysis_tool/tools.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/ast/visitor.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; -import 'package:analyzer/src/codegen/tools.dart'; import 'package:analyzer/src/context/builder.dart'; import 'package:analyzer/src/dart/analysis/byte_store.dart'; import 'package:analyzer/src/dart/analysis/driver.dart'; diff --git a/pkg/analyzer_plugin/pubspec.yaml b/pkg/analyzer_plugin/pubspec.yaml index e331c5caeeb..c1c650256f8 100644 --- a/pkg/analyzer_plugin/pubspec.yaml +++ b/pkg/analyzer_plugin/pubspec.yaml @@ -16,5 +16,7 @@ dependencies: pub_semver: '^1.3.2' dev_dependencies: + analysis_tool: + path: ../analysis_tool test_reflective_loader: ^0.1.8 test: ^1.0.0 diff --git a/pkg/analyzer_plugin/tool/spec/check_all_test.dart b/pkg/analyzer_plugin/tool/spec/check_all_test.dart index 33f1cca25ab..82806dba10a 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 0669bef2cef..f4e92dd4d00 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 8fec4fad034..924e5c355fd 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_inttest_methods.dart @@ -7,7 +7,7 @@ */ import 'dart:convert'; -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 226c7079cfe..bd6c7e153d9 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_matchers.dart @@ -7,7 +7,7 @@ */ import 'dart:convert'; -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 4f81c837307..0798d3138e7 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 755f586aa9d..7ff25701de6 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 34f8a6297a9..fe9cf690d22 100644 --- a/pkg/analyzer_plugin/tool/spec/from_html.dart +++ b/pkg/analyzer_plugin/tool/spec/from_html.dart @@ -7,7 +7,7 @@ */ import 'dart:io'; -import 'package:analyzer/src/codegen/html.dart'; +import 'package:analysis_tool/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 f60d83a7d55..f959c851f7e 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:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 856b2a417b3..2cf1c8bdbe4 100644 --- a/pkg/analyzer_plugin/tool/spec/implied_types.dart +++ b/pkg/analyzer_plugin/tool/spec/implied_types.dart @@ -5,7 +5,7 @@ /** * Code for enumerating the set of types implied by the API. */ -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/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 0956e6ff6fb..5a519e001ac 100644 --- a/pkg/analyzer_plugin/tool/spec/to_html.dart +++ b/pkg/analyzer_plugin/tool/spec/to_html.dart @@ -9,8 +9,8 @@ */ import 'dart:convert'; -import 'package:analyzer/src/codegen/html.dart'; -import 'package:analyzer/src/codegen/tools.dart'; +import 'package:analysis_tool/html.dart'; +import 'package:analysis_tool/tools.dart'; import 'package:html/dom.dart' as dom; import 'api.dart';