diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart index 2eff1ad3a19..38457b01dc0 100644 --- a/pkg/analysis_server/lib/src/analysis_server.dart +++ b/pkg/analysis_server/lib/src/analysis_server.dart @@ -16,21 +16,25 @@ import 'package:analysis_server/src/channel/channel.dart'; import 'package:analysis_server/src/computer/computer_highlights.dart'; import 'package:analysis_server/src/context_manager.dart'; import 'package:analysis_server/src/domain_analysis.dart'; -import 'package:analysis_server/src/domain_analytics.dart'; import 'package:analysis_server/src/domain_completion.dart'; -import 'package:analysis_server/src/domain_diagnostic.dart'; -import 'package:analysis_server/src/domain_kythe.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/analytics_enable.dart'; +import 'package:analysis_server/src/handler/legacy/analytics_is_enabled.dart'; +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/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'; import 'package:analysis_server/src/handler/legacy/execution_map_uri.dart'; import 'package:analysis_server/src/handler/legacy/execution_set_subscriptions.dart'; +import 'package:analysis_server/src/handler/legacy/kythe_get_kythe_entries.dart'; import 'package:analysis_server/src/handler/legacy/legacy_handler.dart'; import 'package:analysis_server/src/operation/operation_analysis.dart'; import 'package:analysis_server/src/plugin/notification_manager.dart'; @@ -81,6 +85,20 @@ class AnalysisServer extends AbstractAnalysisServer { /// A map from the name of a request to a function used to create a request /// handler. static final Map handlerGenerators = { + ANALYTICS_REQUEST_IS_ENABLED: (server, request, cancellationToken) => + AnalyticsIsEnabledHandler(server, request, cancellationToken), + ANALYTICS_REQUEST_ENABLE: (server, request, cancellationToken) => + AnalyticsEnableHandler(server, request, cancellationToken), + ANALYTICS_REQUEST_SEND_EVENT: (server, request, cancellationToken) => + AnalyticsSendEventHandler(server, request, cancellationToken), + ANALYTICS_REQUEST_SEND_TIMING: (server, request, cancellationToken) => + AnalyticsSendTimingHandler(server, request, cancellationToken), + // + DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS: (server, request, cancellationToken) => + DiagnosticGetDiagnosticsHandler(server, request, cancellationToken), + DIAGNOSTIC_REQUEST_GET_SERVER_PORT: (server, request, cancellationToken) => + DiagnosticGetServerPortHandler(server, request, cancellationToken), + // EXECUTION_REQUEST_CREATE_CONTEXT: (server, request, cancellationToken) => ExecutionCreateContextHandler(server, request, cancellationToken), EXECUTION_REQUEST_DELETE_CONTEXT: (server, request, cancellationToken) => @@ -91,6 +109,9 @@ class AnalysisServer extends AbstractAnalysisServer { ExecutionMapUriHandler(server, request, cancellationToken), EXECUTION_REQUEST_SET_SUBSCRIPTIONS: (server, request, cancellationToken) => ExecutionSetSubscriptionsHandler(server, request, cancellationToken), + // + KYTHE_REQUEST_GET_KYTHE_ENTRIES: (server, request, cancellationToken) => + KytheGetKytheEntriesHandler(server, request, cancellationToken), }; /// The channel from which requests are received and to which responses should @@ -248,9 +269,6 @@ class AnalysisServer extends AbstractAnalysisServer { EditDomainHandler(this), SearchDomainHandler(this), CompletionDomainHandler(this), - DiagnosticDomainHandler(this), - AnalyticsDomainHandler(this), - KytheDomainHandler(this), FlutterDomainHandler(this) ]; } diff --git a/pkg/analysis_server/lib/src/domain_analytics.dart b/pkg/analysis_server/lib/src/domain_analytics.dart deleted file mode 100644 index caebdc3a229..00000000000 --- a/pkg/analysis_server/lib/src/domain_analytics.dart +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file -// 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/protocol/protocol.dart'; -import 'package:analysis_server/protocol/protocol_constants.dart'; -import 'package:analysis_server/src/analysis_server.dart'; -import 'package:analysis_server/src/handler/legacy/analytics_enable.dart'; -import 'package:analysis_server/src/handler/legacy/analytics_is_enabled.dart'; -import 'package:analysis_server/src/handler/legacy/analytics_send_event.dart'; -import 'package:analysis_server/src/handler/legacy/analytics_send_timing.dart'; -import 'package:analyzer/src/utilities/cancellation.dart'; - -/// Instances of the class [AnalyticsDomainHandler] implement a [RequestHandler] -/// that handles requests in the `analytics` domain. -class AnalyticsDomainHandler implements RequestHandler { - final AnalysisServer server; - - AnalyticsDomainHandler(this.server); - - @override - Response? handleRequest( - Request request, CancellationToken cancellationToken) { - var requestName = request.method; - - if (requestName == ANALYTICS_REQUEST_IS_ENABLED) { - AnalyticsIsEnabledHandler(server, request, cancellationToken).handle(); - return Response.DELAYED_RESPONSE; - } else if (requestName == ANALYTICS_REQUEST_ENABLE) { - AnalyticsEnableHandler(server, request, cancellationToken).handle(); - return Response.DELAYED_RESPONSE; - } else if (requestName == ANALYTICS_REQUEST_SEND_EVENT) { - AnalyticsSendEventHandler(server, request, cancellationToken).handle(); - return Response.DELAYED_RESPONSE; - } else if (requestName == ANALYTICS_REQUEST_SEND_TIMING) { - AnalyticsSendTimingHandler(server, request, cancellationToken).handle(); - return Response.DELAYED_RESPONSE; - } - return null; - } -} diff --git a/pkg/analysis_server/lib/src/domain_diagnostic.dart b/pkg/analysis_server/lib/src/domain_diagnostic.dart deleted file mode 100644 index e3d2eb8ab72..00000000000 --- a/pkg/analysis_server/lib/src/domain_diagnostic.dart +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file -// 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/protocol/protocol.dart'; -import 'package:analysis_server/protocol/protocol_constants.dart'; -import 'package:analysis_server/src/analysis_server.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:analyzer/src/utilities/cancellation.dart'; - -/// Instances of the class [DiagnosticDomainHandler] implement a -/// [RequestHandler] that handles requests in the `diagnostic` domain. -class DiagnosticDomainHandler implements RequestHandler { - /// The analysis server that is using this handler to process requests. - final AnalysisServer server; - - /// Initialize a newly created handler to handle requests for the given - /// [server]. - DiagnosticDomainHandler(this.server); - - @override - Response? handleRequest( - Request request, CancellationToken cancellationToken) { - try { - var requestName = request.method; - if (requestName == DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS) { - DiagnosticGetDiagnosticsHandler(server, request, cancellationToken) - .handle(); - return Response.DELAYED_RESPONSE; - } else if (requestName == DIAGNOSTIC_REQUEST_GET_SERVER_PORT) { - DiagnosticGetServerPortHandler(server, request, cancellationToken) - .handle(); - return Response.DELAYED_RESPONSE; - } - } on RequestFailure catch (exception) { - return exception.response; - } - return null; - } -} diff --git a/pkg/analysis_server/lib/src/domain_kythe.dart b/pkg/analysis_server/lib/src/domain_kythe.dart deleted file mode 100644 index 9b62c453532..00000000000 --- a/pkg/analysis_server/lib/src/domain_kythe.dart +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file -// 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/protocol/protocol.dart'; -import 'package:analysis_server/protocol/protocol_constants.dart'; -import 'package:analysis_server/src/analysis_server.dart'; -import 'package:analysis_server/src/domain_abstract.dart'; -import 'package:analysis_server/src/handler/legacy/kythe_get_kythe_entries.dart'; -import 'package:analyzer/src/utilities/cancellation.dart'; - -/// Instances of the class [KytheDomainHandler] implement a [RequestHandler] -/// that handles requests in the `kythe` domain. -class KytheDomainHandler extends AbstractRequestHandler { - /// Initialize a newly created handler to handle requests for the given - /// [server]. - KytheDomainHandler(AnalysisServer server) : super(server); - - @override - Response? handleRequest( - Request request, CancellationToken cancellationToken) { - try { - var requestName = request.method; - if (requestName == KYTHE_REQUEST_GET_KYTHE_ENTRIES) { - KytheGetKytheEntriesHandler(server, request, cancellationToken) - .handle(); - return Response.DELAYED_RESPONSE; - } - } on RequestFailure catch (exception) { - return exception.response; - } - return null; - } -} diff --git a/pkg/analysis_server/test/domain_diagnostic_test.dart b/pkg/analysis_server/test/domain_diagnostic_test.dart index 13b58292930..dd79a9004a5 100644 --- a/pkg/analysis_server/test/domain_diagnostic_test.dart +++ b/pkg/analysis_server/test/domain_diagnostic_test.dart @@ -3,7 +3,6 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analysis_server/protocol/protocol_generated.dart'; -import 'package:analysis_server/src/domain_diagnostic.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; @@ -17,13 +16,6 @@ void main() { @reflectiveTest class DiagnosticDomainTest extends AbstractAnalysisTest { - @override - void setUp() { - super.setUp(); - handler = DiagnosticDomainHandler(server); - server.handlers = [handler]; - } - Future test_getDiagnostics() async { newPubspecYamlFile('/project', 'name: project'); newFile2('/project/bin/test.dart', 'main() {}');