Skip to content

Commit 34ad8e0

Browse files
srawlinsCommit Queue
authored and
Commit Queue
committed
Move FixProcessors and registeredFixGenerators to analysis_server_plugin
These two are needed in the shared package so that plugins can run CorrectionProducers. They go in 'src' because plugin developers do not need to see this code. Work towards #53402 Cq-Include-Trybots: luci.dart.try:flutter-analyze-try,analyzer-win-release-try,pkg-win-release-try Change-Id: Iee5b5dd063d5b0a9b00c58b91a3e50328c8b5fc2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/377860 Reviewed-by: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 009c9a6 commit 34ad8e0

File tree

18 files changed

+23
-23
lines changed

18 files changed

+23
-23
lines changed

pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
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_server/src/services/correction/fix_generators.dart';
65
import 'package:analysis_server_plugin/src/correction/change_workspace.dart';
6+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
77
import 'package:analyzer/dart/analysis/results.dart';
88
import 'package:analyzer/error/error.dart';
99
import 'package:analyzer/instrumentation/service.dart';

pkg/analysis_server/lib/src/analysis_server.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import 'package:analysis_server/src/server/diagnostic_server.dart';
2727
import 'package:analysis_server/src/server/performance.dart';
2828
import 'package:analysis_server/src/services/completion/completion_performance.dart';
2929
import 'package:analysis_server/src/services/correction/assist_internal.dart';
30-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
3130
import 'package:analysis_server/src/services/correction/namespace.dart';
3231
import 'package:analysis_server/src/services/pub/pub_api.dart';
3332
import 'package:analysis_server/src/services/pub/pub_command.dart';
@@ -44,6 +43,7 @@ import 'package:analysis_server/src/utilities/null_string_sink.dart';
4443
import 'package:analysis_server/src/utilities/process.dart';
4544
import 'package:analysis_server/src/utilities/request_statistics.dart';
4645
import 'package:analysis_server/src/utilities/tee_string_sink.dart';
46+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
4747
import 'package:analyzer/dart/analysis/results.dart';
4848
import 'package:analyzer/dart/analysis/session.dart';
4949
import 'package:analyzer/dart/ast/ast.dart';

pkg/analysis_server/lib/src/cider/assists.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
66
import 'package:analysis_server/src/services/correction/assist.dart';
77
import 'package:analysis_server/src/services/correction/assist_internal.dart';
8-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
98
import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart';
9+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
1010
import 'package:analyzer/dart/analysis/session.dart';
1111
import 'package:analyzer/error/error.dart';
1212
import 'package:analyzer/instrumentation/service.dart';

pkg/analysis_server/lib/src/g3/fixes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import 'package:analysis_server/src/protocol_server.dart' show SourceEdit;
66
import 'package:analysis_server/src/services/correction/fix.dart';
77
import 'package:analysis_server/src/services/correction/fix_internal.dart';
8-
import 'package:analysis_server/src/services/correction/fix_processor.dart';
98
import 'package:analysis_server_plugin/edit/fix/dart_fix_context.dart';
109
import 'package:analysis_server_plugin/edit/fix/fix.dart';
1110
import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart';
11+
import 'package:analysis_server_plugin/src/correction/fix_processor.dart';
1212
import 'package:analyzer/dart/analysis/results.dart';
1313
import 'package:analyzer/error/error.dart';
1414
import 'package:analyzer/file_system/file_system.dart';

pkg/analysis_server/lib/src/services/correction/assist.dart

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

55
import 'package:analysis_server/plugin/edit/assist/assist_dart.dart';
6-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
76
import 'package:analysis_server_plugin/src/correction/change_workspace.dart';
7+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
88
import 'package:analyzer/dart/analysis/results.dart';
99
import 'package:analyzer/error/error.dart';
1010
import 'package:analyzer/instrumentation/service.dart';

pkg/analysis_server/lib/src/services/correction/assist_internal.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ import 'package:analysis_server/src/services/correction/dart/split_and_condition
7171
import 'package:analysis_server/src/services/correction/dart/split_variable_declaration.dart';
7272
import 'package:analysis_server/src/services/correction/dart/surround_with.dart';
7373
import 'package:analysis_server/src/services/correction/dart/use_curly_braces.dart';
74-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
7574
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
75+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
7676
import 'package:analyzer/error/error.dart';
7777
import 'package:analyzer/src/dart/ast/utilities.dart';
7878
import 'package:analyzer/src/generated/java_core.dart';

pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import 'package:analysis_server/src/services/correction/dart/data_driven.dart';
1111
import 'package:analysis_server/src/services/correction/dart/organize_imports.dart';
1212
import 'package:analysis_server/src/services/correction/dart/remove_unused_import.dart';
1313
import 'package:analysis_server/src/services/correction/fix/pubspec/fix_generator.dart';
14-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
15-
import 'package:analysis_server/src/services/correction/fix_processor.dart';
1614
import 'package:analysis_server/src/services/correction/organize_imports.dart';
1715
import 'package:analysis_server/src/services/linter/lint_names.dart';
1816
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
1917
import 'package:analysis_server_plugin/edit/fix/dart_fix_context.dart';
2018
import 'package:analysis_server_plugin/edit/fix/fix.dart';
2119
import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart';
20+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
21+
import 'package:analysis_server_plugin/src/correction/fix_processor.dart';
2222
import 'package:analyzer/dart/analysis/analysis_context.dart';
2323
import 'package:analyzer/dart/analysis/analysis_options.dart';
2424
import 'package:analyzer/dart/analysis/results.dart';

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,11 @@ import 'package:analysis_server/src/services/correction/dart/use_not_eq_null.dar
239239
import 'package:analysis_server/src/services/correction/dart/use_rethrow.dart';
240240
import 'package:analysis_server/src/services/correction/dart/wrap_in_text.dart';
241241
import 'package:analysis_server/src/services/correction/dart/wrap_in_unawaited.dart';
242-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
243-
import 'package:analysis_server/src/services/correction/fix_processor.dart';
244242
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
245243
import 'package:analysis_server_plugin/edit/fix/dart_fix_context.dart';
246244
import 'package:analysis_server_plugin/edit/fix/fix.dart';
245+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
246+
import 'package:analysis_server_plugin/src/correction/fix_processor.dart';
247247
import 'package:analyzer/error/error.dart';
248248
import 'package:analyzer/src/dart/error/ffi_code.g.dart';
249249
import 'package:analyzer/src/error/codes.dart';

pkg/analysis_server/test/src/cider/assists_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
66
import 'package:analysis_server/src/cider/assists.dart';
77
import 'package:analysis_server/src/services/correction/assist.dart';
88
import 'package:analysis_server/src/services/correction/assist_internal.dart';
9-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
9+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
1010
import 'package:analyzer/error/error.dart';
1111
import 'package:analyzer/source/line_info.dart';
1212
import 'package:analyzer_plugin/protocol/protocol_common.dart' show SourceEdit;

pkg/analysis_server/test/src/services/correction/assist/assist_processor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
66
import 'package:analysis_server/src/services/correction/assist.dart';
77
import 'package:analysis_server/src/services/correction/assist_internal.dart';
8-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
98
import 'package:analysis_server_plugin/src/correction/change_workspace.dart';
109
import 'package:analysis_server_plugin/src/correction/dart_change_workspace.dart';
10+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
1111
import 'package:analyzer/error/error.dart';
1212
import 'package:analyzer/src/test_utilities/platform.dart';
1313
import 'package:analyzer_plugin/protocol/protocol_common.dart'

pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import 'package:analysis_server/src/services/correction/bulk_fix_processor.dart';
66
import 'package:analysis_server/src/services/correction/dart/data_driven.dart';
77
import 'package:analysis_server/src/services/correction/fix/data_driven/transform_set_manager.dart';
8-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
98
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
9+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
1010
import 'package:test/test.dart';
1111
import 'package:test_reflective_loader/test_reflective_loader.dart';
1212

pkg/analysis_server/test/src/services/correction/fix/fix_in_file_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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_server/src/services/correction/fix_generators.dart';
65
import 'package:analysis_server/src/services/linter/lint_names.dart';
76
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
7+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
88
import 'package:test/test.dart';
99
import 'package:test_reflective_loader/test_reflective_loader.dart';
1010

pkg/analysis_server/test/src/services/correction/fix/fix_processor_map_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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_server/src/services/correction/fix_generators.dart';
65
import 'package:analysis_server/src/services/correction/fix_internal.dart';
76
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
7+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
88
import 'package:analyzer/error/error.dart';
99
import 'package:test/test.dart';
1010
import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/tool/bulk_fix/supported_diagnostics.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
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_server/src/services/correction/fix_generators.dart';
65
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
6+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
77
import 'package:analyzer/error/error.dart';
88

99
import 'parse_utils.dart';

pkg/analysis_server/tool/bulk_fix/supported_lints.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
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_server/src/services/correction/fix_generators.dart';
65
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
6+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
77

88
/// Prints lints that are bulk-fixable in a format that can be included in
99
/// analysis options.

pkg/analysis_server/tool/presubmit/verify_error_fix_status.dart

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

77
import 'package:analysis_server/src/services/correction/fix/analysis_options/fix_generator.dart';
88
import 'package:analysis_server/src/services/correction/fix/pubspec/fix_generator.dart';
9-
import 'package:analysis_server/src/services/correction/fix_generators.dart';
109
import 'package:analysis_server/src/services/correction/fix_internal.dart';
10+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
1111
import 'package:analyzer/error/error.dart';
1212
import 'package:analyzer/file_system/physical_file_system.dart';
1313
import 'package:analyzer/src/lint/registry.dart';

pkg/analysis_server/lib/src/services/correction/fix_processor.dart renamed to pkg/analysis_server_plugin/lib/src/correction/fix_processor.dart

Lines changed: 5 additions & 5 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_server/src/services/correction/fix_generators.dart';
65
import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
76
import 'package:analysis_server_plugin/edit/fix/dart_fix_context.dart';
87
import 'package:analysis_server_plugin/edit/fix/fix.dart';
8+
import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
99
import 'package:analyzer/src/error/codes.dart';
1010
import 'package:analyzer/src/generated/java_core.dart';
1111
import 'package:analyzer/src/util/file_paths.dart';
@@ -16,16 +16,16 @@ import 'package:analyzer_plugin/utilities/change_builder/conflicting_edit_except
1616
class FixProcessor {
1717
final DartFixContext _fixContext;
1818

19-
final List<Fix> fixes = <Fix>[];
19+
final List<Fix> _fixes = <Fix>[];
2020

2121
FixProcessor(this._fixContext);
2222

2323
Future<List<Fix>> compute() async {
2424
if (isMacroGenerated(_fixContext.resolvedResult.file.path)) {
25-
return fixes;
25+
return _fixes;
2626
}
2727
await _addFromProducers();
28-
return fixes;
28+
return _fixes;
2929
}
3030

3131
void _addFixFromBuilder(ChangeBuilder builder, CorrectionProducer producer) {
@@ -41,7 +41,7 @@ class FixProcessor {
4141

4242
change.id = kind.id;
4343
change.message = formatList(kind.message, producer.fixArguments);
44-
fixes.add(Fix(kind: kind, change: change));
44+
_fixes.add(Fix(kind: kind, change: change));
4545
}
4646

4747
Future<void> _addFromProducers() async {

0 commit comments

Comments
 (0)