Remove EditDomainHandler

Change-Id: I06ecd6519702d9c7efee570ec458b7178a3709f4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/242340
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Brian Wilkerson 2022-04-25 04:27:32 +00:00 committed by Commit Bot
parent dfd5109b64
commit 45e205b193
3 changed files with 35 additions and 90 deletions

View file

@ -19,7 +19,6 @@ import 'package:analysis_server/src/domain_completion.dart';
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_event.dart';
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/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/utilities/process.dart';
import 'package:analysis_server/src/utilities/request_statistics.dart';
import 'package:analyzer/dart/analysis/results.dart';
@ -124,6 +138,25 @@ class AnalysisServer extends AbstractAnalysisServer {
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 @@ class AnalysisServer extends AbstractAnalysisServer {
.listen(handleRequest, onDone: done, onError: error);
handlers = <server.RequestHandler>[
ServerDomainHandler(this),
EditDomainHandler(this),
SearchDomainHandler(this),
CompletionDomainHandler(this),
FlutterDomainHandler(this)

View file

@ -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_afterCreateChange = false;
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.

View file

@ -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';