From 22fe2d2a478dd5b630113beecea48629bf540ee4 Mon Sep 17 00:00:00 2001 From: Brian Wilkerson Date: Wed, 3 Aug 2022 21:37:26 +0000 Subject: [PATCH] Move the legacy refactoring support into a legacy folder There were no changes other than to move the files and update the imports to match. Change-Id: I0790d9bf7287d62756ad7534b760689489706d40 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/253602 Commit-Queue: Brian Wilkerson Reviewed-by: Phil Quitslund Reviewed-by: Konstantin Shcheglov --- .../lib/src/analysis_server.dart | 4 +-- pkg/analysis_server/lib/src/cider/rename.dart | 4 +-- .../edit_get_available_refactorings.dart | 2 +- .../handlers/commands/abstract_refactor.dart | 2 +- .../lsp/handlers/handler_code_actions.dart | 2 +- .../lib/src/lsp/handlers/handler_rename.dart | 4 +-- .../handlers/handler_will_rename_files.dart | 2 +- .../lib/src/lsp/lsp_analysis_server.dart | 2 +- .../convert_getter_to_method.dart | 4 +-- .../convert_method_to_getter.dart | 4 +-- .../{ => legacy}/extract_local.dart | 6 ++-- .../{ => legacy}/extract_method.dart | 12 +++---- .../{ => legacy}/extract_widget.dart | 6 ++-- .../{ => legacy}/inline_local.dart | 4 +-- .../{ => legacy}/inline_method.dart | 6 ++-- .../refactoring/{ => legacy}/move_file.dart | 4 +-- .../{ => legacy}/naming_conventions.dart | 0 .../refactoring/{ => legacy}/refactoring.dart | 32 +++++++++---------- .../{ => legacy}/refactoring_internal.dart | 2 +- .../{ => legacy}/refactoring_manager.dart | 2 +- .../refactoring/{ => legacy}/rename.dart | 4 +-- .../{ => legacy}/rename_class_member.dart | 10 +++--- .../{ => legacy}/rename_constructor.dart | 8 ++--- .../{ => legacy}/rename_extension_member.dart | 8 ++--- .../{ => legacy}/rename_import.dart | 8 ++--- .../{ => legacy}/rename_label.dart | 6 ++-- .../{ => legacy}/rename_library.dart | 6 ++-- .../{ => legacy}/rename_local.dart | 8 ++--- .../{ => legacy}/rename_unit_member.dart | 6 ++-- .../{ => legacy}/visible_ranges_computer.dart | 0 .../test/edit/refactoring_test.dart | 2 +- .../refactoring/abstract_refactoring.dart | 2 +- .../services/refactoring/abstract_rename.dart | 2 +- .../convert_getter_to_method_test.dart | 2 +- .../convert_method_to_getter_test.dart | 2 +- .../refactoring/extract_local_test.dart | 2 +- .../refactoring/extract_method_test.dart | 2 +- .../refactoring/extract_widget_test.dart | 2 +- .../refactoring/inline_local_test.dart | 2 +- .../refactoring/inline_method_test.dart | 2 +- .../services/refactoring/move_file_test.dart | 2 +- .../refactoring/naming_conventions_test.dart | 4 +-- .../refactoring/rename_constructor_test.dart | 2 +- 43 files changed, 98 insertions(+), 98 deletions(-) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/convert_getter_to_method.dart (96%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/convert_method_to_getter.dart (96%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/extract_local.dart (98%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/extract_method.dart (98%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/extract_widget.dart (98%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/inline_local.dart (97%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/inline_method.dart (99%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/move_file.dart (98%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/naming_conventions.dart (100%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/refactoring.dart (93%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/refactoring_internal.dart (97%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/refactoring_manager.dart (99%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename.dart (95%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename_class_member.dart (96%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename_constructor.dart (93%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename_extension_member.dart (95%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename_import.dart (92%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename_label.dart (81%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename_library.dart (82%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename_local.dart (94%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/rename_unit_member.dart (97%) rename pkg/analysis_server/lib/src/services/refactoring/{ => legacy}/visible_ranges_computer.dart (100%) diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart index 92511ccb39c..a4ea05d1b8d 100644 --- a/pkg/analysis_server/lib/src/analysis_server.dart +++ b/pkg/analysis_server/lib/src/analysis_server.dart @@ -90,8 +90,8 @@ import 'package:analysis_server/src/server/sdk_configuration.dart'; import 'package:analysis_server/src/services/completion/completion_state.dart'; import 'package:analysis_server/src/services/execution/execution_context.dart'; import 'package:analysis_server/src/services/flutter/widget_descriptions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_manager.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_manager.dart'; import 'package:analysis_server/src/utilities/process.dart'; import 'package:analysis_server/src/utilities/request_statistics.dart'; import 'package:analyzer/dart/analysis/results.dart'; diff --git a/pkg/analysis_server/lib/src/cider/rename.dart b/pkg/analysis_server/lib/src/cider/rename.dart index 3ff2d18285e..7b00736afe0 100644 --- a/pkg/analysis_server/lib/src/cider/rename.dart +++ b/pkg/analysis_server/lib/src/cider/rename.dart @@ -5,8 +5,8 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analysis_server/src/services/search/hierarchy.dart'; import 'package:analysis_server/src/utilities/flutter.dart'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart index 5fa0b4ad6d5..1e63f000293 100644 --- a/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart +++ b/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:analysis_server/protocol/protocol_generated.dart'; import 'package:analysis_server/src/handler/legacy/legacy_handler.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/dart/ast/utilities.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart index 561cd23bf3d..8d46e2009b1 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart @@ -10,7 +10,7 @@ import 'package:analysis_server/src/lsp/handlers/commands/simple_edit_handler.da import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/progress.dart'; import 'package:analysis_server/src/protocol_server.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/dart/ast/utilities.dart'; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart index bd82a4a1eaa..e11e588d761 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart @@ -13,7 +13,7 @@ import 'package:analysis_server/src/services/correction/assist_internal.dart'; import 'package:analysis_server/src/services/correction/change_workspace.dart'; import 'package:analysis_server/src/services/correction/fix.dart'; import 'package:analysis_server/src/services/correction/fix_internal.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/analysis/session.dart' show InconsistentAnalysisException; diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart index facbfd87cf7..8c578814e3b 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart @@ -7,8 +7,8 @@ import 'package:analysis_server/src/lsp/client_configuration.dart'; import 'package:analysis_server/src/lsp/constants.dart'; import 'package:analysis_server/src/lsp/handlers/handlers.dart'; import 'package:analysis_server/src/lsp/mapping.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/rename_unit_member.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_unit_member.dart'; import 'package:analyzer/dart/element/element.dart'; class PrepareRenameHandler extends MessageHandler { diff --git a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart index 3c57d356e0d..e7f0ca93dec 100644 --- a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart +++ b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart @@ -30,7 +30,7 @@ import 'package:analysis_server/src/server/detachable_filesystem_manager.dart'; import 'package:analysis_server/src/server/diagnostic_server.dart'; import 'package:analysis_server/src/server/error_notifier.dart'; import 'package:analysis_server/src/server/performance.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analysis_server/src/utilities/process.dart'; import 'package:analyzer/dart/analysis/context_locator.dart'; import 'package:analyzer/dart/analysis/results.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart similarity index 96% rename from pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart index e0f92373016..b10f2140749 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/convert_getter_to_method.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart @@ -4,8 +4,8 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; import 'package:analysis_server/src/services/search/hierarchy.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analyzer/dart/analysis/session.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart similarity index 96% rename from pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart index 427b1a1ba96..069baef65cf 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart @@ -4,8 +4,8 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; import 'package:analysis_server/src/services/search/hierarchy.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analyzer/dart/analysis/session.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart similarity index 98% rename from pkg/analysis_server/lib/src/services/refactoring/extract_local.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart index 607535c9e93..2bd7555b568 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart @@ -8,9 +8,9 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/name_suggestion.dart'; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; import 'package:analysis_server/src/utilities/strings.dart'; import 'package:analyzer/dart/analysis/code_style_options.dart'; import 'package:analyzer/dart/analysis/features.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart similarity index 98% rename from pkg/analysis_server/lib/src/services/refactoring/extract_method.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart index 80d51929310..c18f88feda4 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart @@ -8,12 +8,12 @@ import 'package:analysis_server/src/services/correction/selection_analyzer.dart' import 'package:analysis_server/src/services/correction/statement_analyzer.dart'; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; -import 'package:analysis_server/src/services/refactoring/rename_class_member.dart'; -import 'package:analysis_server/src/services/refactoring/rename_unit_member.dart'; -import 'package:analysis_server/src/services/refactoring/visible_ranges_computer.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_class_member.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_unit_member.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/visible_ranges_computer.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analysis_server/src/utilities/extensions/ast.dart'; import 'package:analyzer/dart/analysis/features.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart similarity index 98% rename from pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart index b476d7cefb4..85bbc24b932 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/extract_widget.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_widget.dart @@ -5,9 +5,9 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; import 'package:analysis_server/src/services/search/element_visitors.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analysis_server/src/utilities/flutter.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart similarity index 97% rename from pkg/analysis_server/lib/src/services/refactoring/inline_local.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart index e0f3df7107f..62b91402be9 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart @@ -5,8 +5,8 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart similarity index 99% rename from pkg/analysis_server/lib/src/services/refactoring/inline_method.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart index fec885dc7e5..c44741a762b 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart @@ -5,9 +5,9 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; -import 'package:analysis_server/src/services/refactoring/visible_ranges_computer.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/visible_ranges_computer.dart'; import 'package:analysis_server/src/services/search/hierarchy.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analysis_server/src/utilities/strings.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/move_file.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/move_file.dart similarity index 98% rename from pkg/analysis_server/lib/src/services/refactoring/move_file.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/move_file.dart index f3f985b6de6..fab53d5fa0c 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/move_file.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/move_file.dart @@ -4,8 +4,8 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; import 'package:analysis_server/src/utilities/extensions/ast.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/analysis/session.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/naming_conventions.dart similarity index 100% rename from pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/naming_conventions.dart diff --git a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart similarity index 93% rename from pkg/analysis_server/lib/src/services/refactoring/refactoring.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart index 88c21deb0a0..12758bf7d12 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart @@ -3,22 +3,22 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/convert_getter_to_method.dart'; -import 'package:analysis_server/src/services/refactoring/convert_method_to_getter.dart'; -import 'package:analysis_server/src/services/refactoring/extract_local.dart'; -import 'package:analysis_server/src/services/refactoring/extract_method.dart'; -import 'package:analysis_server/src/services/refactoring/extract_widget.dart'; -import 'package:analysis_server/src/services/refactoring/inline_local.dart'; -import 'package:analysis_server/src/services/refactoring/inline_method.dart'; -import 'package:analysis_server/src/services/refactoring/move_file.dart'; -import 'package:analysis_server/src/services/refactoring/rename_class_member.dart'; -import 'package:analysis_server/src/services/refactoring/rename_constructor.dart'; -import 'package:analysis_server/src/services/refactoring/rename_extension_member.dart'; -import 'package:analysis_server/src/services/refactoring/rename_import.dart'; -import 'package:analysis_server/src/services/refactoring/rename_label.dart'; -import 'package:analysis_server/src/services/refactoring/rename_library.dart'; -import 'package:analysis_server/src/services/refactoring/rename_local.dart'; -import 'package:analysis_server/src/services/refactoring/rename_unit_member.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/convert_getter_to_method.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/convert_method_to_getter.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/extract_local.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/extract_method.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/extract_widget.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/inline_local.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/inline_method.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/move_file.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_class_member.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_constructor.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_extension_member.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_import.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_label.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_library.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_local.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename_unit_member.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/analysis/session.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/refactoring_internal.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_internal.dart similarity index 97% rename from pkg/analysis_server/lib/src/services/refactoring/refactoring_internal.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_internal.dart index d1b121e46fb..76be8d4e5b0 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/refactoring_internal.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_internal.dart @@ -6,7 +6,7 @@ import 'dart:collection'; import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/generated/source.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/refactoring_manager.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart similarity index 99% rename from pkg/analysis_server/lib/src/services/refactoring/refactoring_manager.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart index bcc0341f7ad..730a8c827a3 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/refactoring_manager.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart @@ -9,7 +9,7 @@ import 'package:analysis_server/src/collections.dart'; import 'package:analysis_server/src/protocol_server.dart' hide AnalysisError, Element; import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analyzer/dart/analysis/session.dart'; import 'package:analyzer/dart/element/element.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart similarity index 95% rename from pkg/analysis_server/lib/src/services/refactoring/rename.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart index a4cba5ba516..bc26e1506ec 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart @@ -5,8 +5,8 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/generated/java_core.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart similarity index 96% rename from pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart index 7661de2a6f0..cafd9675245 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename_class_member.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart @@ -6,11 +6,11 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element, ElementKind; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; -import 'package:analysis_server/src/services/refactoring/rename.dart'; -import 'package:analysis_server/src/services/refactoring/visible_ranges_computer.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/visible_ranges_computer.dart'; import 'package:analysis_server/src/services/search/hierarchy.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analysis_server/src/utilities/strings.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart similarity index 93% rename from pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart index 134d6e4b0ac..d4972cb1503 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename_constructor.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart @@ -5,10 +5,10 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; -import 'package:analysis_server/src/services/refactoring/rename.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename.dart'; import 'package:analysis_server/src/services/search/hierarchy.dart'; import 'package:analyzer/dart/analysis/session.dart'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_extension_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart similarity index 95% rename from pkg/analysis_server/lib/src/services/refactoring/rename_extension_member.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart index f0b65ab83ac..c1bb99b9361 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename_extension_member.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart @@ -6,10 +6,10 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element, ElementKind; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/rename.dart'; -import 'package:analysis_server/src/services/refactoring/visible_ranges_computer.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/visible_ranges_computer.dart'; import 'package:analysis_server/src/services/search/hierarchy.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analyzer/dart/analysis/session.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_import.dart similarity index 92% rename from pkg/analysis_server/lib/src/services/refactoring/rename_import.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename_import.dart index edcdd80aab6..01e2ccd36f7 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_import.dart @@ -4,10 +4,10 @@ import 'package:analysis_server/src/protocol_server.dart'; import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart'; -import 'package:analysis_server/src/services/refactoring/rename.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_internal.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/analysis/session.dart'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_label.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_label.dart similarity index 81% rename from pkg/analysis_server/lib/src/services/refactoring/rename_label.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename_label.dart index a2ca2212702..b6c37103650 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename_label.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_label.dart @@ -3,9 +3,9 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/rename.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename.dart'; import 'package:analyzer/dart/element/element.dart'; /// A [Refactoring] for renaming [LabelElement]s. diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_library.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_library.dart similarity index 82% rename from pkg/analysis_server/lib/src/services/refactoring/rename_library.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename_library.dart index ae5d6545773..1423092bdf9 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename_library.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_library.dart @@ -3,9 +3,9 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/rename.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename.dart'; import 'package:analyzer/dart/element/element.dart'; /// A [Refactoring] for renaming [LibraryElement]s. diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart similarity index 94% rename from pkg/analysis_server/lib/src/services/refactoring/rename_local.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart index 26b9a08ea22..1df2986fe98 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart @@ -6,10 +6,10 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element, ElementKind; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/rename.dart'; -import 'package:analysis_server/src/services/refactoring/visible_ranges_computer.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/visible_ranges_computer.dart'; import 'package:analysis_server/src/services/search/hierarchy.dart'; import 'package:analyzer/dart/analysis/session.dart'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart similarity index 97% rename from pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart index caa56791086..0ef382bf8a8 100644 --- a/pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.dart +++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart @@ -6,9 +6,9 @@ import 'package:analysis_server/src/protocol_server.dart' show newLocation_fromElement, newLocation_fromMatch; import 'package:analysis_server/src/services/correction/status.dart'; import 'package:analysis_server/src/services/correction/util.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; -import 'package:analysis_server/src/services/refactoring/rename.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/rename.dart'; import 'package:analysis_server/src/services/search/element_visitors.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analysis_server/src/utilities/flutter.dart'; diff --git a/pkg/analysis_server/lib/src/services/refactoring/visible_ranges_computer.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/visible_ranges_computer.dart similarity index 100% rename from pkg/analysis_server/lib/src/services/refactoring/visible_ranges_computer.dart rename to pkg/analysis_server/lib/src/services/refactoring/legacy/visible_ranges_computer.dart diff --git a/pkg/analysis_server/test/edit/refactoring_test.dart b/pkg/analysis_server/test/edit/refactoring_test.dart index e397c48cfde..f080f50bcb5 100644 --- a/pkg/analysis_server/test/edit/refactoring_test.dart +++ b/pkg/analysis_server/test/edit/refactoring_test.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:analysis_server/protocol/protocol.dart'; import 'package:analysis_server/protocol/protocol_generated.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring_manager.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring_manager.dart'; import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart index 010d5366dd7..793296a0ec1 100644 --- a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart +++ b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analysis_server/src/services/search/search_engine.dart'; import 'package:analysis_server/src/services/search/search_engine_internal.dart'; import 'package:analyzer/src/generated/source.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/abstract_rename.dart b/pkg/analysis_server/test/services/refactoring/abstract_rename.dart index dab7e2cfe9b..9bbe6a53c1b 100644 --- a/pkg/analysis_server/test/services/refactoring/abstract_rename.dart +++ b/pkg/analysis_server/test/services/refactoring/abstract_rename.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/namespace.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/src/dart/ast/element_locator.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart b/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart index a0a8d9a733f..29d6dd91c69 100644 --- a/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart +++ b/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_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:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' hide ElementKind; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart b/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart index 3c2042657d6..af7fa9aa399 100644 --- a/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart +++ b/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_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:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' show RefactoringProblemSeverity; diff --git a/pkg/analysis_server/test/services/refactoring/extract_local_test.dart b/pkg/analysis_server/test/services/refactoring/extract_local_test.dart index 018abef1cbe..b2db53c645b 100644 --- a/pkg/analysis_server/test/services/refactoring/extract_local_test.dart +++ b/pkg/analysis_server/test/services/refactoring/extract_local_test.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'package:analysis_server/src/services/linter/lint_names.dart'; -import 'package:analysis_server/src/services/refactoring/extract_local.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/extract_local.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/extract_method_test.dart b/pkg/analysis_server/test/services/refactoring/extract_method_test.dart index 4335a2d9189..759b9c5714c 100644 --- a/pkg/analysis_server/test/services/refactoring/extract_method_test.dart +++ b/pkg/analysis_server/test/services/refactoring/extract_method_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:analysis_server/src/services/refactoring/extract_method.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/extract_method.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart b/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart index eabe685a9f8..2c5b47399b2 100644 --- a/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart +++ b/pkg/analysis_server/test/services/refactoring/extract_widget_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:analysis_server/src/services/refactoring/extract_widget.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/extract_widget.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/inline_local_test.dart b/pkg/analysis_server/test/services/refactoring/inline_local_test.dart index 3f299ed1500..174be56f859 100644 --- a/pkg/analysis_server/test/services/refactoring/inline_local_test.dart +++ b/pkg/analysis_server/test/services/refactoring/inline_local_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/inline_local.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/inline_local.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/inline_method_test.dart b/pkg/analysis_server/test/services/refactoring/inline_method_test.dart index 372ce62a022..d5048894a5a 100644 --- a/pkg/analysis_server/test/services/refactoring/inline_method_test.dart +++ b/pkg/analysis_server/test/services/refactoring/inline_method_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:analysis_server/src/services/refactoring/inline_method.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/inline_method.dart'; import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/move_file_test.dart b/pkg/analysis_server/test/services/refactoring/move_file_test.dart index c4baa2743e0..c605bcd0380 100644 --- a/pkg/analysis_server/test/services/refactoring/move_file_test.dart +++ b/pkg/analysis_server/test/services/refactoring/move_file_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/protocol_server.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/naming_conventions_test.dart b/pkg/analysis_server/test/services/refactoring/naming_conventions_test.dart index 05be8f8d92d..d721d15d395 100644 --- a/pkg/analysis_server/test/services/refactoring/naming_conventions_test.dart +++ b/pkg/analysis_server/test/services/refactoring/naming_conventions_test.dart @@ -3,8 +3,8 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/correction/status.dart'; -import 'package:analysis_server/src/services/refactoring/naming_conventions.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/naming_conventions.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' show RefactoringProblemSeverity; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart b/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart index acb01ea4d6f..a690c71fa18 100644 --- a/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart +++ b/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/src/services/linter/lint_names.dart'; -import 'package:analysis_server/src/services/refactoring/refactoring.dart'; +import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart';