Version 2.18.0-54.0.dev
Merge commit '45e205b19364baa3900402422dfa74db6124c7aa' into 'dev'
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index dec0e78..0e77b18 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -19,7 +19,6 @@
import 'package:analysis_server/src/domain_server.dart';
import 'package:analysis_server/src/domains/analysis/occurrences.dart';
import 'package:analysis_server/src/domains/analysis/occurrences_dart.dart';
-import 'package:analysis_server/src/edit/edit_domain.dart';
import 'package:analysis_server/src/flutter/flutter_domain.dart';
import 'package:analysis_server/src/flutter/flutter_notifications.dart';
import 'package:analysis_server/src/handler/legacy/analysis_get_errors.dart';
@@ -40,6 +39,20 @@
import 'package:analysis_server/src/handler/legacy/analytics_send_timing.dart';
import 'package:analysis_server/src/handler/legacy/diagnostic_get_diagnostics.dart';
import 'package:analysis_server/src/handler/legacy/diagnostic_get_server_port.dart';
+import 'package:analysis_server/src/handler/legacy/edit_bulk_fixes.dart';
+import 'package:analysis_server/src/handler/legacy/edit_format.dart';
+import 'package:analysis_server/src/handler/legacy/edit_format_if_enabled.dart';
+import 'package:analysis_server/src/handler/legacy/edit_get_assists.dart';
+import 'package:analysis_server/src/handler/legacy/edit_get_available_refactorings.dart';
+import 'package:analysis_server/src/handler/legacy/edit_get_fixes.dart';
+import 'package:analysis_server/src/handler/legacy/edit_get_postfix_completion.dart';
+import 'package:analysis_server/src/handler/legacy/edit_get_refactoring.dart';
+import 'package:analysis_server/src/handler/legacy/edit_get_statement_completion.dart';
+import 'package:analysis_server/src/handler/legacy/edit_import_elements.dart';
+import 'package:analysis_server/src/handler/legacy/edit_is_postfix_completion_applicable.dart';
+import 'package:analysis_server/src/handler/legacy/edit_list_postfix_completion_templates.dart';
+import 'package:analysis_server/src/handler/legacy/edit_organize_directives.dart';
+import 'package:analysis_server/src/handler/legacy/edit_sort_members.dart';
import 'package:analysis_server/src/handler/legacy/execution_create_context.dart';
import 'package:analysis_server/src/handler/legacy/execution_delete_context.dart';
import 'package:analysis_server/src/handler/legacy/execution_get_suggestions.dart';
@@ -63,6 +76,7 @@
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/utilities/process.dart';
import 'package:analysis_server/src/utilities/request_statistics.dart';
import 'package:analyzer/dart/analysis/results.dart';
@@ -124,6 +138,25 @@
DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS: DiagnosticGetDiagnosticsHandler.new,
DIAGNOSTIC_REQUEST_GET_SERVER_PORT: DiagnosticGetServerPortHandler.new,
//
+ EDIT_REQUEST_FORMAT: EditFormatHandler.new,
+ EDIT_REQUEST_FORMAT_IF_ENABLED: EditFormatIfEnabledHandler.new,
+ EDIT_REQUEST_GET_ASSISTS: EditGetAssistsHandler.new,
+ EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS:
+ EditGetAvailableRefactoringsHandler.new,
+ EDIT_REQUEST_BULK_FIXES: EditBulkFixes.new,
+ EDIT_REQUEST_GET_FIXES: EditGetFixesHandler.new,
+ EDIT_REQUEST_GET_REFACTORING: EditGetRefactoringHandler.new,
+ EDIT_REQUEST_IMPORT_ELEMENTS: EditImportElementsHandler.new,
+ EDIT_REQUEST_ORGANIZE_DIRECTIVES: EditOrganizeDirectivesHandler.new,
+ EDIT_REQUEST_SORT_MEMBERS: EditSortMembersHandler.new,
+ EDIT_REQUEST_GET_STATEMENT_COMPLETION:
+ EditGetStatementCompletionHandler.new,
+ EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE:
+ EditIsPostfixCompletionApplicableHandler.new,
+ EDIT_REQUEST_GET_POSTFIX_COMPLETION: EditGetPostfixCompletionHandler.new,
+ EDIT_REQUEST_LIST_POSTFIX_COMPLETION_TEMPLATES:
+ EditListPostfixCompletionTemplatesHandler.new,
+ //
EXECUTION_REQUEST_CREATE_CONTEXT: ExecutionCreateContextHandler.new,
EXECUTION_REQUEST_DELETE_CONTEXT: ExecutionDeleteContextHandler.new,
EXECUTION_REQUEST_GET_SUGGESTIONS: ExecutionGetSuggestionsHandler.new,
@@ -296,7 +329,6 @@
.listen(handleRequest, onDone: done, onError: error);
handlers = <server.RequestHandler>[
ServerDomainHandler(this),
- EditDomainHandler(this),
SearchDomainHandler(this),
CompletionDomainHandler(this),
FlutterDomainHandler(this)
diff --git a/pkg/analysis_server/lib/src/edit/edit_domain.dart b/pkg/analysis_server/lib/src/services/refactoring/refactoring_manager.dart
similarity index 77%
rename from pkg/analysis_server/lib/src/edit/edit_domain.dart
rename to pkg/analysis_server/lib/src/services/refactoring/refactoring_manager.dart
index 87660ab..e54b148 100644
--- a/pkg/analysis_server/lib/src/edit/edit_domain.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/refactoring_manager.dart
@@ -4,24 +4,8 @@
import 'dart:async';
-import 'package:analysis_server/protocol/protocol_constants.dart';
import 'package:analysis_server/src/analysis_server.dart';
import 'package:analysis_server/src/collections.dart';
-import 'package:analysis_server/src/domain_abstract.dart';
-import 'package:analysis_server/src/handler/legacy/edit_bulk_fixes.dart';
-import 'package:analysis_server/src/handler/legacy/edit_format.dart';
-import 'package:analysis_server/src/handler/legacy/edit_format_if_enabled.dart';
-import 'package:analysis_server/src/handler/legacy/edit_get_assists.dart';
-import 'package:analysis_server/src/handler/legacy/edit_get_available_refactorings.dart';
-import 'package:analysis_server/src/handler/legacy/edit_get_fixes.dart';
-import 'package:analysis_server/src/handler/legacy/edit_get_postfix_completion.dart';
-import 'package:analysis_server/src/handler/legacy/edit_get_refactoring.dart';
-import 'package:analysis_server/src/handler/legacy/edit_get_statement_completion.dart';
-import 'package:analysis_server/src/handler/legacy/edit_import_elements.dart';
-import 'package:analysis_server/src/handler/legacy/edit_is_postfix_completion_applicable.dart';
-import 'package:analysis_server/src/handler/legacy/edit_list_postfix_completion_templates.dart';
-import 'package:analysis_server/src/handler/legacy/edit_organize_directives.dart';
-import 'package:analysis_server/src/handler/legacy/edit_sort_members.dart';
import 'package:analysis_server/src/protocol_server.dart'
hide AnalysisError, Element;
import 'package:analysis_server/src/services/correction/status.dart';
@@ -42,77 +26,6 @@
bool test_simulateRefactoringReset_afterFinalConditions = false;
bool test_simulateRefactoringReset_afterInitialConditions = false;
-/// Instances of the class [EditDomainHandler] implement a [RequestHandler]
-/// that handles requests in the edit domain.
-class EditDomainHandler extends AbstractRequestHandler {
- /// Initialize a newly created handler to handle requests for the given
- /// [server].
- EditDomainHandler(super.server);
-
- @override
- Response? handleRequest(
- Request request, CancellationToken cancellationToken) {
- try {
- var requestName = request.method;
- if (requestName == EDIT_REQUEST_FORMAT) {
- EditFormatHandler(server, request, cancellationToken).handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_FORMAT_IF_ENABLED) {
- EditFormatIfEnabledHandler(server, request, cancellationToken).handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_GET_ASSISTS) {
- EditGetAssistsHandler(server, request, cancellationToken).handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS) {
- EditGetAvailableRefactoringsHandler(server, request, cancellationToken)
- .handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_BULK_FIXES) {
- EditBulkFixes(server, request, cancellationToken).handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_GET_FIXES) {
- EditGetFixesHandler(server, request, cancellationToken).handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_GET_REFACTORING) {
- EditGetRefactoringHandler(server, request, cancellationToken).handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_IMPORT_ELEMENTS) {
- EditImportElementsHandler(server, request, cancellationToken).handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_ORGANIZE_DIRECTIVES) {
- EditOrganizeDirectivesHandler(server, request, cancellationToken)
- .handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_SORT_MEMBERS) {
- EditSortMembersHandler(server, request, cancellationToken).handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_GET_STATEMENT_COMPLETION) {
- EditGetStatementCompletionHandler(server, request, cancellationToken)
- .handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE) {
- EditIsPostfixCompletionApplicableHandler(
- server, request, cancellationToken)
- .handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName == EDIT_REQUEST_GET_POSTFIX_COMPLETION) {
- EditGetPostfixCompletionHandler(server, request, cancellationToken)
- .handle();
- return Response.DELAYED_RESPONSE;
- } else if (requestName ==
- EDIT_REQUEST_LIST_POSTFIX_COMPLETION_TEMPLATES) {
- EditListPostfixCompletionTemplatesHandler(
- server, request, cancellationToken)
- .handle();
- return Response.DELAYED_RESPONSE;
- }
- } on RequestFailure catch (exception) {
- return exception.response;
- }
- return null;
- }
-}
-
/// An object managing a single [Refactoring] instance.
///
/// The instance is identified by its kind, file, offset and length.
diff --git a/pkg/analysis_server/test/edit/refactoring_test.dart b/pkg/analysis_server/test/edit/refactoring_test.dart
index eef47df..1b16e40 100644
--- a/pkg/analysis_server/test/edit/refactoring_test.dart
+++ b/pkg/analysis_server/test/edit/refactoring_test.dart
@@ -4,7 +4,7 @@
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
-import 'package:analysis_server/src/edit/edit_domain.dart';
+import 'package:analysis_server/src/services/refactoring/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/tools/VERSION b/tools/VERSION
index 7521b97..b34c352 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 18
PATCH 0
-PRERELEASE 53
+PRERELEASE 54
PRERELEASE_PATCH 0
\ No newline at end of file
