Skip to content

Commit b407814

Browse files
srawlinsCommit Queue
authored andcommitted
Bump analyzer_plugin to use Dart SDK 3.9.0
Change-Id: Ice7b7e978ccc666c18cbea9cb9e79673893066ed Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/448221 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 70f621e commit b407814

File tree

91 files changed

+8604
-4923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+8604
-4923
lines changed

pkg/analyzer_plugin/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## 0.13.8-dev
22

33
- Require version `8.2.0` of the `analyzer` package.
4+
- Require Dart SDK `^3.9.0`.
45

56
## 0.13.7
67

pkg/analyzer_plugin/analysis_options.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ linter:
2424
- unnecessary_library_directive
2525
- unnecessary_parenthesis
2626
- unreachable_from_main
27+
- use_null_aware_elements

pkg/analyzer_plugin/lib/channel/channel.dart

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ abstract class PluginCommunicationChannel {
2121
/// the socket, invoke the [onError] function. If the socket is closed by the
2222
/// client, invoke the [onDone] function. Only one listener is allowed per
2323
/// channel.
24-
void listen(void Function(Request request) onRequest,
25-
{Function? onError, void Function()? onDone});
24+
void listen(
25+
void Function(Request request) onRequest, {
26+
Function? onError,
27+
void Function()? onDone,
28+
});
2629

2730
/// Send the given [notification] to the server.
2831
void sendNotification(Notification notification);
@@ -50,9 +53,12 @@ abstract class ServerCommunicationChannel {
5053
/// trying to read from the socket, invoke the [onError] function. If the
5154
/// socket is closed by the plugin, invoke the [onDone] function. Only one
5255
/// listener is allowed per channel.
53-
void listen(void Function(Response response) onResponse,
54-
void Function(Notification notification) onNotification,
55-
{void Function(dynamic error)? onError, void Function()? onDone});
56+
void listen(
57+
void Function(Response response) onResponse,
58+
void Function(Notification notification) onNotification, {
59+
void Function(dynamic error)? onError,
60+
void Function()? onDone,
61+
});
5662

5763
/// Send the given [request] to the plugin.
5864
void sendRequest(Request request);

pkg/analyzer_plugin/lib/plugin/assist_mixin.dart

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ mixin AssistsMixin implements ServerPlugin {
2727

2828
@override
2929
Future<EditGetAssistsResult> handleEditGetAssists(
30-
EditGetAssistsParams parameters) async {
30+
EditGetAssistsParams parameters,
31+
) async {
3132
var path = parameters.file;
3233
var request = await getAssistRequest(parameters);
3334
var generator = AssistGenerator(getAssistContributors(path));
@@ -47,10 +48,15 @@ mixin AssistsMixin implements ServerPlugin {
4748
abstract class DartAssistsMixin implements AssistsMixin {
4849
@override
4950
Future<AssistRequest> getAssistRequest(
50-
EditGetAssistsParams parameters) async {
51+
EditGetAssistsParams parameters,
52+
) async {
5153
var path = parameters.file;
5254
var result = await getResolvedUnitResult(path);
5355
return DartAssistRequestImpl(
54-
resourceProvider, parameters.offset, parameters.length, result);
56+
resourceProvider,
57+
parameters.offset,
58+
parameters.length,
59+
result,
60+
);
5561
}
5662
}

pkg/analyzer_plugin/lib/plugin/completion_mixin.dart

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ mixin CompletionMixin implements ServerPlugin {
2424
///
2525
/// Throw a [RequestFailure] if the request could not be created.
2626
Future<CompletionRequest> getCompletionRequest(
27-
CompletionGetSuggestionsParams parameters);
27+
CompletionGetSuggestionsParams parameters,
28+
);
2829

2930
@override
3031
Future<CompletionGetSuggestionsResult> handleCompletionGetSuggestions(
31-
CompletionGetSuggestionsParams parameters) async {
32+
CompletionGetSuggestionsParams parameters,
33+
) async {
3234
var path = parameters.file;
3335
var request = await getCompletionRequest(parameters);
3436
var generator = CompletionGenerator(getCompletionContributors(path));
@@ -49,9 +51,13 @@ mixin CompletionMixin implements ServerPlugin {
4951
abstract class DartCompletionMixin implements CompletionMixin {
5052
@override
5153
Future<CompletionRequest> getCompletionRequest(
52-
CompletionGetSuggestionsParams parameters) async {
54+
CompletionGetSuggestionsParams parameters,
55+
) async {
5356
var result = await getResolvedUnitResult(parameters.file);
5457
return DartCompletionRequestImpl(
55-
resourceProvider, parameters.offset, result);
58+
resourceProvider,
59+
parameters.offset,
60+
result,
61+
);
5662
}
5763
}

pkg/analyzer_plugin/lib/plugin/fix_mixin.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ mixin DartFixesMixin implements FixesMixin {
2525
var offset = parameters.offset;
2626
var result = await getResolvedUnitResult(path);
2727
return DartFixesRequestImpl(
28-
resourceProvider, offset, _getDiagnostics(offset, result), result);
28+
resourceProvider,
29+
offset,
30+
_getDiagnostics(offset, result),
31+
result,
32+
);
2933
}
3034

3135
List<Diagnostic> _getDiagnostics(int offset, ResolvedUnitResult result) {
@@ -56,7 +60,8 @@ mixin FixesMixin implements ServerPlugin {
5660

5761
@override
5862
Future<EditGetFixesResult> handleEditGetFixes(
59-
EditGetFixesParams parameters) async {
63+
EditGetFixesParams parameters,
64+
) async {
6065
var path = parameters.file;
6166
var request = await getFixesRequest(parameters);
6267
var generator = FixGenerator(getFixContributors(path));

pkg/analyzer_plugin/lib/plugin/navigation_mixin.dart

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import 'package:analyzer_plugin/utilities/navigation/navigation.dart';
2020
mixin DartNavigationMixin implements NavigationMixin {
2121
@override
2222
Future<NavigationRequest> getNavigationRequest(
23-
AnalysisGetNavigationParams parameters) async {
23+
AnalysisGetNavigationParams parameters,
24+
) async {
2425
var path = parameters.file;
2526
var result = await getResolvedUnitResult(path);
2627
var offset = parameters.offset;
@@ -48,11 +49,13 @@ mixin NavigationMixin implements ServerPlugin {
4849
///
4950
/// Throw a [RequestFailure] if the request could not be created.
5051
Future<NavigationRequest> getNavigationRequest(
51-
AnalysisGetNavigationParams parameters);
52+
AnalysisGetNavigationParams parameters,
53+
);
5254

5355
@override
5456
Future<AnalysisGetNavigationResult> handleAnalysisGetNavigation(
55-
AnalysisGetNavigationParams parameters) async {
57+
AnalysisGetNavigationParams parameters,
58+
) async {
5659
var path = parameters.file;
5760
var request = await getNavigationRequest(parameters);
5861
var generator = NavigationGenerator(getNavigationContributors(path));
@@ -66,8 +69,9 @@ mixin NavigationMixin implements ServerPlugin {
6669
@override
6770
Future<void> sendNavigationNotification(String path) async {
6871
try {
69-
var request =
70-
await getNavigationRequest(AnalysisGetNavigationParams(path, -1, -1));
72+
var request = await getNavigationRequest(
73+
AnalysisGetNavigationParams(path, -1, -1),
74+
);
7175
var generator = NavigationGenerator(getNavigationContributors(path));
7276
var generatorResult = generator.generateNavigationNotification(request);
7377
generatorResult.sendNotifications(channel);

0 commit comments

Comments
 (0)