Skip to content

Commit 1377e00

Browse files
scheglovCommit Bot
authored andcommitted
Switch analysis_server to 2.15
So, we can use constructor tear-offs :-) Change-Id: Ib819da7715e49496b01defa9dc3837bd70019134 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/240642 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 6b6e6da commit 1377e00

File tree

5 files changed

+18
-30
lines changed

5 files changed

+18
-30
lines changed

.dart_tool/package_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"name": "analysis_server",
7070
"rootUri": "../pkg/analysis_server",
7171
"packageUri": "lib/",
72-
"languageVersion": "2.14"
72+
"languageVersion": "2.15"
7373
},
7474
{
7575
"name": "analysis_server_client",

pkg/analysis_server/lib/src/analysis_server.dart

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,33 +85,21 @@ class AnalysisServer extends AbstractAnalysisServer {
8585
/// A map from the name of a request to a function used to create a request
8686
/// handler.
8787
static final Map<String, HandlerGenerator> handlerGenerators = {
88-
ANALYTICS_REQUEST_IS_ENABLED: (server, request, cancellationToken) =>
89-
AnalyticsIsEnabledHandler(server, request, cancellationToken),
90-
ANALYTICS_REQUEST_ENABLE: (server, request, cancellationToken) =>
91-
AnalyticsEnableHandler(server, request, cancellationToken),
92-
ANALYTICS_REQUEST_SEND_EVENT: (server, request, cancellationToken) =>
93-
AnalyticsSendEventHandler(server, request, cancellationToken),
94-
ANALYTICS_REQUEST_SEND_TIMING: (server, request, cancellationToken) =>
95-
AnalyticsSendTimingHandler(server, request, cancellationToken),
88+
ANALYTICS_REQUEST_IS_ENABLED: AnalyticsIsEnabledHandler.new,
89+
ANALYTICS_REQUEST_ENABLE: AnalyticsEnableHandler.new,
90+
ANALYTICS_REQUEST_SEND_EVENT: AnalyticsSendEventHandler.new,
91+
ANALYTICS_REQUEST_SEND_TIMING: AnalyticsSendTimingHandler.new,
9692
//
97-
DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS: (server, request, cancellationToken) =>
98-
DiagnosticGetDiagnosticsHandler(server, request, cancellationToken),
99-
DIAGNOSTIC_REQUEST_GET_SERVER_PORT: (server, request, cancellationToken) =>
100-
DiagnosticGetServerPortHandler(server, request, cancellationToken),
93+
DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS: DiagnosticGetDiagnosticsHandler.new,
94+
DIAGNOSTIC_REQUEST_GET_SERVER_PORT: DiagnosticGetServerPortHandler.new,
10195
//
102-
EXECUTION_REQUEST_CREATE_CONTEXT: (server, request, cancellationToken) =>
103-
ExecutionCreateContextHandler(server, request, cancellationToken),
104-
EXECUTION_REQUEST_DELETE_CONTEXT: (server, request, cancellationToken) =>
105-
ExecutionDeleteContextHandler(server, request, cancellationToken),
106-
EXECUTION_REQUEST_GET_SUGGESTIONS: (server, request, cancellationToken) =>
107-
ExecutionGetSuggestionsHandler(server, request, cancellationToken),
108-
EXECUTION_REQUEST_MAP_URI: (server, request, cancellationToken) =>
109-
ExecutionMapUriHandler(server, request, cancellationToken),
110-
EXECUTION_REQUEST_SET_SUBSCRIPTIONS: (server, request, cancellationToken) =>
111-
ExecutionSetSubscriptionsHandler(server, request, cancellationToken),
96+
EXECUTION_REQUEST_CREATE_CONTEXT: ExecutionCreateContextHandler.new,
97+
EXECUTION_REQUEST_DELETE_CONTEXT: ExecutionDeleteContextHandler.new,
98+
EXECUTION_REQUEST_GET_SUGGESTIONS: ExecutionGetSuggestionsHandler.new,
99+
EXECUTION_REQUEST_MAP_URI: ExecutionMapUriHandler.new,
100+
EXECUTION_REQUEST_SET_SUBSCRIPTIONS: ExecutionSetSubscriptionsHandler.new,
112101
//
113-
KYTHE_REQUEST_GET_KYTHE_ENTRIES: (server, request, cancellationToken) =>
114-
KytheGetKytheEntriesHandler(server, request, cancellationToken),
102+
KYTHE_REQUEST_GET_KYTHE_ENTRIES: KytheGetKytheEntriesHandler.new,
115103
};
116104

117105
/// The channel from which requests are received and to which responses should

pkg/analysis_server/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: analysis_server
33
publish_to: none
44

55
environment:
6-
sdk: '>=2.14.0 <3.0.0'
6+
sdk: '>=2.15.0 <3.0.0'
77

88
dependencies:
99
_fe_analyzer_shared:

pkg/analysis_server/test/integration/lsp_server/integration_tests.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ class LspServerClient {
150150

151151
var dartBinary = join(dartSdkPath, 'bin', 'dart');
152152

153-
var useSnapshot = true;
153+
// Prevent flow analysis from marking code below as being dead.
154+
const useSnapshot = 1 > 0;
154155
String serverPath;
155156

156157
if (useSnapshot) {

pkg/analysis_server/test/integration/support/integration_tests.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,8 @@ class Server {
622622

623623
var dartBinary = path.join(dartSdkPath, 'bin', 'dart');
624624

625-
// The integration tests run 3x faster when run from snapshots (you need to
626-
// run test.py with --use-sdk).
627-
var useSnapshot = true;
625+
// Prevent flow analysis from marking code below as being dead.
626+
const useSnapshot = 1 > 0;
628627
String serverPath;
629628

630629
if (useSnapshot) {

0 commit comments

Comments
 (0)