Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 7bbace2

Browse files
author
Dart CI
committed
Version 2.12.0-41.0.dev
Merge commit '8abc99d07a7b7fa965bd6a441d718fd924e886e3' into 'dev'
2 parents bf20abb + 8abc99d commit 7bbace2

File tree

86 files changed

+526
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+526
-386
lines changed

‎.dart_tool/package_config.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@
7373
"packageUri": "lib/",
7474
"languageVersion": "2.8"
7575
},
76-
{
77-
"name": "analysis_tool",
78-
"rootUri": "../pkg/analysis_tool",
79-
"packageUri": "lib/",
80-
"languageVersion": "2.1"
81-
},
8276
{
8377
"name": "analyzer",
8478
"rootUri": "../pkg/analyzer",
@@ -97,6 +91,12 @@
9791
"packageUri": "lib/",
9892
"languageVersion": "2.3"
9993
},
94+
{
95+
"name": "analyzer_utilities",
96+
"rootUri": "../pkg/analyzer_utilities",
97+
"packageUri": "lib/",
98+
"languageVersion": "2.1"
99+
},
100100
{
101101
"name": "args",
102102
"rootUri": "../third_party/pkg/args",

‎.packages‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ _fe_analyzer_shared:pkg/_fe_analyzer_shared/lib
1010
_js_interop_checks:pkg/_js_interop_checks/lib
1111
analysis_server:pkg/analysis_server/lib
1212
analysis_server_client:pkg/analysis_server_client/lib
13-
analysis_tool:pkg/analysis_tool/lib
1413
analyzer:pkg/analyzer/lib
1514
analyzer_cli:pkg/analyzer_cli/lib
1615
analyzer_plugin:pkg/analyzer_plugin/lib
16+
analyzer_utilities:pkg/analyzer_utilities/lib
1717
args:third_party/pkg/args/lib
1818
async:third_party/pkg/async/lib
1919
async_helper:pkg/async_helper/lib

‎pkg/analysis_server/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies:
3030
yaml: any
3131

3232
dev_dependencies:
33-
analysis_tool: any
33+
analyzer_utilities: any
3434
http: any
3535
logging: any
3636
matcher: any

‎pkg/analysis_server/test/src/utilities/mock_packages.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:analysis_tool/package_root.dart' as package_root;
65
import 'package:analyzer/file_system/file_system.dart';
76
import 'package:analyzer/file_system/memory_file_system.dart';
87
import 'package:analyzer/file_system/physical_file_system.dart';
8+
import 'package:analyzer_utilities/package_root.dart' as package_root;
99

1010
/// Helper for copying files from "tests/mock_packages" to memory file system.
1111
class MockPackages {

‎pkg/analysis_server/test/verify_sorted_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import 'dart:io';
66

77
import 'package:analysis_server/src/services/correction/sort_members.dart';
8-
import 'package:analysis_tool/package_root.dart';
98
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
109
import 'package:analyzer/dart/analysis/results.dart';
1110
import 'package:analyzer/dart/analysis/session.dart';
1211
import 'package:analyzer/file_system/file_system.dart';
1312
import 'package:analyzer/file_system/physical_file_system.dart';
13+
import 'package:analyzer_utilities/package_root.dart';
1414
import 'package:meta/meta.dart';
1515
import 'package:test/test.dart';
1616

‎pkg/analysis_server/test/verify_tests_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:analysis_tool/package_root.dart' as package_root;
6-
import 'package:analysis_tool/verify_tests.dart';
75
import 'package:analyzer/file_system/file_system.dart';
86
import 'package:analyzer/file_system/physical_file_system.dart';
7+
import 'package:analyzer_utilities/package_root.dart' as package_root;
8+
import 'package:analyzer_utilities/verify_tests.dart';
99

1010
void main() {
1111
var provider = PhysicalResourceProvider.INSTANCE;

‎pkg/analysis_server/tool/completion_metrics/relevance_table_generator.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import 'package:_fe_analyzer_shared/src/base/syntactic_entity.dart';
88
import 'package:analysis_server/src/protocol_server.dart' show ElementKind;
99
import 'package:analysis_server/src/services/completion/dart/feature_computer.dart';
1010
import 'package:analysis_server/src/utilities/flutter.dart';
11-
import 'package:analysis_tool/package_root.dart' as package_root;
12-
import 'package:analysis_tool/tools.dart';
1311
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
1412
import 'package:analyzer/dart/analysis/context_root.dart';
1513
import 'package:analyzer/dart/analysis/results.dart';
@@ -24,6 +22,8 @@ import 'package:analyzer/diagnostic/diagnostic.dart';
2422
import 'package:analyzer/file_system/physical_file_system.dart';
2523
import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
2624
import 'package:analyzer/src/generated/engine.dart';
25+
import 'package:analyzer_utilities/package_root.dart' as package_root;
26+
import 'package:analyzer_utilities/tools.dart';
2727
import 'package:args/args.dart';
2828
import 'package:meta/meta.dart';
2929

‎pkg/analysis_server/tool/spec/check_all_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'dart:io';
66

7-
import 'package:analysis_tool/tools.dart';
7+
import 'package:analyzer_utilities/tools.dart';
88
import 'package:path/path.dart';
99

1010
import 'generate_all.dart';

‎pkg/analysis_server/tool/spec/codegen_analysis_server.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
/// Code generation for the file "AnalysisServer.java".
6-
import 'package:analysis_tool/tools.dart';
6+
import 'package:analyzer_utilities/tools.dart';
77

88
import 'api.dart';
99
import 'codegen_java.dart';

‎pkg/analysis_server/tool/spec/codegen_dart_notification_handler.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:analysis_tool/tools.dart';
5+
import 'package:analyzer_utilities/tools.dart';
66
import 'package:html/dom.dart';
77

88
import 'api.dart';

0 commit comments

Comments
 (0)