Skip to content

Commit 2798409

Browse files
srawlinsCommit Queue
srawlins
authored and
Commit Queue
committed
[analysis_server] Avoid Future-of-implicit-dynamic in tests
* 99% of these are `Future ` --> `Future<void> ` * There are some `test_` methods which declare a return type of `Future` which is non-idiomatic, I think, but in order to create a pragmatic consistency, I added `<void>` to the few test methods in these libraries. Later if we desire, we can remove all of the return types. * Also a few `Completer ` --> `Completer<void> ` and `Stream ` --> `Stream<Object?> ` * There are many remaining cases in `lib/` Change-Id: I41cd51bab6886788e15ac7065dd21e95e789d09f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/287260 Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 55ddbe5 commit 2798409

Some content is hidden

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

41 files changed

+126
-122
lines changed

‎pkg/analysis_server/test/analysis/notification_closing_labels_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ Widget build(BuildContext context) {
3939

4040
List<ClosingLabel>? lastLabels;
4141

42-
late Completer _labelsReceived;
42+
late Completer<void> _labelsReceived;
4343

4444
@override
4545
void processNotification(Notification notification) {
4646
if (notification.event == ANALYSIS_NOTIFICATION_CLOSING_LABELS) {
4747
var params = AnalysisClosingLabelsParams.fromNotification(notification);
4848
if (params.file == testFile.path) {
4949
lastLabels = params.labels;
50-
_labelsReceived.complete(null);
50+
_labelsReceived.complete();
5151
}
5252
} else if (notification.event == SERVER_NOTIFICATION_ERROR) {
5353
var params = ServerErrorParams.fromNotification(notification);

‎pkg/analysis_server/test/analysis/notification_folding_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ main async() {}
3434

3535
List<FoldingRegion>? lastRegions;
3636

37-
late Completer _regionsReceived;
37+
late Completer<void> _regionsReceived;
3838

3939
@override
4040
void processNotification(Notification notification) {
4141
if (notification.event == ANALYSIS_NOTIFICATION_FOLDING) {
4242
var params = AnalysisFoldingParams.fromNotification(notification);
4343
if (params.file == testFile.path) {
4444
lastRegions = params.regions;
45-
_regionsReceived.complete(null);
45+
_regionsReceived.complete();
4646
}
4747
} else if (notification.event == SERVER_NOTIFICATION_ERROR) {
4848
var params = ServerErrorParams.fromNotification(notification);

‎pkg/analysis_server/test/analysis/notification_implemented_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@ class B extends A {
526526
assertNoImplementedMember('m() => 0');
527527
}
528528

529-
Future waitForImplementedElements() {
530-
Future waitForNotification(int times) {
529+
Future<void> waitForImplementedElements() {
530+
Future<void> waitForNotification(int times) {
531531
if (times == 0 || implementedClasses != null) {
532532
return Future.value();
533533
}

‎pkg/analysis_server/test/analysis/notification_outline_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AnalysisNotificationOutlineTest extends PubPackageAnalysisServerTest {
2626
Outline? outline;
2727

2828
final Completer<void> _outlineReceived = Completer();
29-
Completer? _highlightsReceived = Completer();
29+
Completer<void>? _highlightsReceived = Completer();
3030

3131
Future<void> prepareOutline() async {
3232
await addAnalysisSubscription(AnalysisService.OUTLINE, testFile);
@@ -47,7 +47,7 @@ class AnalysisNotificationOutlineTest extends PubPackageAnalysisServerTest {
4747
if (notification.event == ANALYSIS_NOTIFICATION_HIGHLIGHTS) {
4848
var params = AnalysisHighlightsParams.fromNotification(notification);
4949
if (params.file == testFile.path) {
50-
_highlightsReceived?.complete(null);
50+
_highlightsReceived?.complete();
5151
_highlightsReceived = null;
5252
}
5353
}

‎pkg/analysis_server/test/channel/byte_stream_channel_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ class ByteStreamServerChannelTest {
114114
late Stream<Request> requestStream;
115115

116116
/// Stream of errors received from the channel via [listen()].
117-
late Stream errorStream;
117+
late Stream<Object?> errorStream;
118118

119119
/// Future which is completed when then [listen()] reports [onDone].
120-
late Future doneFuture;
120+
late Future<void> doneFuture;
121121

122122
void setUp() {
123123
var inputStream = StreamController<List<int>>();
@@ -131,7 +131,7 @@ class ByteStreamServerChannelTest {
131131
inputStream.stream, outputSink, InstrumentationService.NULL_SERVICE);
132132
var requestStreamController = StreamController<Request>();
133133
requestStream = requestStreamController.stream;
134-
var errorStreamController = StreamController();
134+
var errorStreamController = StreamController<Object?>();
135135
errorStream = errorStreamController.stream;
136136
var doneCompleter = Completer();
137137
doneFuture = doneCompleter.future;

‎pkg/analysis_server/test/edit/organize_directives_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class OrganizeDirectivesTest extends PubPackageAnalysisServerTest {
2626
}
2727

2828
@failingTest
29-
Future test_BAD_doesNotExist() async {
29+
Future<void> test_BAD_doesNotExist() async {
3030
// The analysis driver fails to return an error
3131
var request =
3232
EditOrganizeDirectivesParams(convertPath('/no/such/file.dart'))
@@ -39,7 +39,7 @@ class OrganizeDirectivesTest extends PubPackageAnalysisServerTest {
3939
);
4040
}
4141

42-
Future test_BAD_hasParseError() async {
42+
Future<void> test_BAD_hasParseError() async {
4343
addTestFile('''
4444
import 'dart:async'
4545
@@ -54,7 +54,7 @@ void f() {}
5454
);
5555
}
5656

57-
Future test_BAD_notDartFile() async {
57+
Future<void> test_BAD_notDartFile() async {
5858
var request = EditOrganizeDirectivesParams(
5959
convertPath('/not-a-Dart-file.txt'),
6060
).toRequest('0');
@@ -88,7 +88,7 @@ void f() {}
8888
);
8989
}
9090

91-
Future test_keep_unresolvedDirectives() {
91+
Future<void> test_keep_unresolvedDirectives() {
9292
var code = r'''
9393
import 'dart:noSuchImportSdkLibrary';
9494
@@ -104,7 +104,7 @@ part 'no_such_part.dart';
104104
return _assertOrganized(code);
105105
}
106106

107-
Future test_OK_remove_duplicateImports_withSamePrefix() {
107+
Future<void> test_OK_remove_duplicateImports_withSamePrefix() {
108108
addTestFile('''
109109
library lib;
110110
@@ -126,7 +126,7 @@ void f() {
126126
''');
127127
}
128128

129-
Future test_OK_remove_unusedImports() {
129+
Future<void> test_OK_remove_unusedImports() {
130130
addTestFile('''
131131
library lib;
132132
@@ -153,13 +153,13 @@ void f() {
153153
''');
154154
}
155155

156-
Future _assertOrganized(String expectedCode) async {
156+
Future<void> _assertOrganized(String expectedCode) async {
157157
await _requestOrganize();
158158
var resultCode = SourceEdit.applySequence(testFileContent, fileEdit.edits);
159159
expect(resultCode, expectedCode);
160160
}
161161

162-
Future _requestOrganize() async {
162+
Future<void> _requestOrganize() async {
163163
var request = EditOrganizeDirectivesParams(testFile.path).toRequest('0');
164164
var response = await handleSuccessfulRequest(request);
165165
var result = EditOrganizeDirectivesResult.fromResponse(response);

‎pkg/analysis_server/test/edit/refactoring_test.dart

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ int? res(int b) {
810810
return result.feedback as ExtractMethodFeedback;
811811
}
812812

813-
Future _prepareOptions() {
813+
Future<void> _prepareOptions() {
814814
return getRefactoringResult(() {
815815
// get initial feedback
816816
return _sendExtractRequest();
@@ -855,7 +855,7 @@ class GetAvailableRefactoringsTest extends PubPackageAnalysisServerTest {
855855

856856
/// Tests that there is refactoring of the given [kind] is available at the
857857
/// [search] offset.
858-
Future assertHasKind(
858+
Future<void> assertHasKind(
859859
String code, String search, RefactoringKind kind, bool expected) async {
860860
addTestFile(code);
861861
await waitForTasksFinished();
@@ -869,13 +869,13 @@ class GetAvailableRefactoringsTest extends PubPackageAnalysisServerTest {
869869
}
870870

871871
/// Tests that there is a RENAME refactoring available at the [search] offset.
872-
Future assertHasRenameRefactoring(String code, String search) async {
872+
Future<void> assertHasRenameRefactoring(String code, String search) async {
873873
return assertHasKind(code, search, RefactoringKind.RENAME, true);
874874
}
875875

876876
/// Returns the list of available refactorings for the given [offset] and
877877
/// [length].
878-
Future getRefactorings(int offset, int length) async {
878+
Future<void> getRefactorings(int offset, int length) async {
879879
var request =
880880
EditGetAvailableRefactoringsParams(testFile.path, offset, length)
881881
.toRequest('0');
@@ -885,12 +885,12 @@ class GetAvailableRefactoringsTest extends PubPackageAnalysisServerTest {
885885
}
886886

887887
/// Returns the list of available refactorings at the offset of [search].
888-
Future getRefactoringsAtString(String search) {
888+
Future<void> getRefactoringsAtString(String search) {
889889
var offset = findOffset(search);
890890
return getRefactorings(offset, 0);
891891
}
892892

893-
Future getRefactoringsForString(String search) {
893+
Future<void> getRefactoringsForString(String search) {
894894
var offset = findOffset(search);
895895
return getRefactorings(offset, search.length);
896896
}
@@ -901,13 +901,13 @@ class GetAvailableRefactoringsTest extends PubPackageAnalysisServerTest {
901901
await setRoots(included: [workspaceRootPath], excluded: []);
902902
}
903903

904-
Future test_convertMethodToGetter_hasElement() {
904+
Future<void> test_convertMethodToGetter_hasElement() {
905905
return assertHasKind('''
906906
int getValue() => 42;
907907
''', 'getValue', RefactoringKind.CONVERT_METHOD_TO_GETTER, true);
908908
}
909909

910-
Future test_extractLocal() async {
910+
Future<void> test_extractLocal() async {
911911
addTestFile('''
912912
void f() {
913913
var a = 1 + 2;
@@ -919,7 +919,7 @@ void f() {
919919
expect(kinds, contains(RefactoringKind.EXTRACT_METHOD));
920920
}
921921

922-
Future test_extractLocal_withoutSelection() async {
922+
Future<void> test_extractLocal_withoutSelection() async {
923923
addTestFile('''
924924
void f() {
925925
var a = 1 + 2;
@@ -931,7 +931,7 @@ void f() {
931931
expect(kinds, contains(RefactoringKind.EXTRACT_METHOD));
932932
}
933933

934-
Future test_extractWidget() async {
934+
Future<void> test_extractWidget() async {
935935
addFlutterPackage();
936936
addTestFile('''
937937
import 'package:flutter/material.dart';
@@ -971,7 +971,7 @@ class MyWidget extends StatelessWidget {
971971
);
972972
}
973973

974-
Future test_rename_hasElement_class() {
974+
Future<void> test_rename_hasElement_class() {
975975
return assertHasRenameRefactoring('''
976976
class Test {}
977977
void f() {
@@ -980,7 +980,7 @@ void f() {
980980
''', 'Test v');
981981
}
982982

983-
Future test_rename_hasElement_constructor() {
983+
Future<void> test_rename_hasElement_constructor() {
984984
return assertHasRenameRefactoring('''
985985
class A {
986986
A.test() {}
@@ -991,7 +991,7 @@ void f() {
991991
''', 'test();');
992992
}
993993

994-
Future test_rename_hasElement_function() {
994+
Future<void> test_rename_hasElement_function() {
995995
return assertHasRenameRefactoring('''
996996
void f() {
997997
test();
@@ -1000,7 +1000,7 @@ test() {}
10001000
''', 'test();');
10011001
}
10021002

1003-
Future test_rename_hasElement_importElement_directive() {
1003+
Future<void> test_rename_hasElement_importElement_directive() {
10041004
return assertHasRenameRefactoring('''
10051005
import 'dart:math' as math;
10061006
void f() {
@@ -1009,7 +1009,7 @@ void f() {
10091009
''', 'import ');
10101010
}
10111011

1012-
Future test_rename_hasElement_importElement_prefixDecl() {
1012+
Future<void> test_rename_hasElement_importElement_prefixDecl() {
10131013
return assertHasRenameRefactoring('''
10141014
import 'dart:math' as math;
10151015
void f() {
@@ -1018,7 +1018,7 @@ void f() {
10181018
''', 'math;');
10191019
}
10201020

1021-
Future test_rename_hasElement_importElement_prefixRef() {
1021+
Future<void> test_rename_hasElement_importElement_prefixRef() {
10221022
return assertHasRenameRefactoring('''
10231023
import 'dart:async' as test;
10241024
import 'dart:math' as test;
@@ -1028,7 +1028,7 @@ void f() {
10281028
''', 'test.pi;');
10291029
}
10301030

1031-
Future test_rename_hasElement_instanceGetter() {
1031+
Future<void> test_rename_hasElement_instanceGetter() {
10321032
return assertHasRenameRefactoring('''
10331033
class A {
10341034
get test => 0;
@@ -1039,7 +1039,7 @@ void f(A a) {
10391039
''', 'test;');
10401040
}
10411041

1042-
Future test_rename_hasElement_instanceSetter() {
1042+
Future<void> test_rename_hasElement_instanceSetter() {
10431043
return assertHasRenameRefactoring('''
10441044
class A {
10451045
set test(x) {}
@@ -1050,13 +1050,13 @@ void f(A a) {
10501050
''', 'test = 2;');
10511051
}
10521052

1053-
Future test_rename_hasElement_library() {
1053+
Future<void> test_rename_hasElement_library() {
10541054
return assertHasRenameRefactoring('''
10551055
library my.lib;
10561056
''', 'library ');
10571057
}
10581058

1059-
Future test_rename_hasElement_localVariable() {
1059+
Future<void> test_rename_hasElement_localVariable() {
10601060
return assertHasRenameRefactoring('''
10611061
void f() {
10621062
int test = 0;
@@ -1065,7 +1065,7 @@ void f() {
10651065
''', 'test = 0;');
10661066
}
10671067

1068-
Future test_rename_hasElement_method() {
1068+
Future<void> test_rename_hasElement_method() {
10691069
return assertHasRenameRefactoring('''
10701070
class A {
10711071
test() {}
@@ -1076,7 +1076,7 @@ void f(A a) {
10761076
''', 'test();');
10771077
}
10781078

1079-
Future test_rename_noElement() async {
1079+
Future<void> test_rename_noElement() async {
10801080
addTestFile('''
10811081
void f() {
10821082
// not an element
@@ -2484,7 +2484,7 @@ void f() {
24842484
class _AbstractGetRefactoring_Test extends PubPackageAnalysisServerTest {
24852485
bool shouldWaitForFullAnalysis = true;
24862486

2487-
Future assertEmptySuccessfulRefactoring(
2487+
Future<void> assertEmptySuccessfulRefactoring(
24882488
Future<Response> Function() requestSender,
24892489
{void Function(RefactoringFeedback?)? feedbackValidator}) async {
24902490
var result = await getRefactoringResult(requestSender);
@@ -2546,7 +2546,7 @@ class _AbstractGetRefactoring_Test extends PubPackageAnalysisServerTest {
25462546
}
25472547
}
25482548

2549-
Future assertSuccessfulRefactoring(
2549+
Future<void> assertSuccessfulRefactoring(
25502550
Future<Response> Function() requestSender, String expectedCode,
25512551
{void Function(RefactoringFeedback?)? feedbackValidator}) async {
25522552
var result = await getRefactoringResult(requestSender);

‎pkg/analysis_server/test/edit/sort_members_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,13 @@ class C {}
262262
''');
263263
}
264264

265-
Future _assertSorted(String expectedCode) async {
265+
Future<void> _assertSorted(String expectedCode) async {
266266
await _requestSort();
267267
var resultCode = SourceEdit.applySequence(testFileContent, fileEdit.edits);
268268
expect(resultCode, expectedCode);
269269
}
270270

271-
Future _requestSort() async {
271+
Future<void> _requestSort() async {
272272
var request = EditSortMembersParams(testFile.path).toRequest('0');
273273
var response = await handleSuccessfulRequest(request);
274274
var result = EditSortMembersResult.fromResponse(response);

‎pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ final LIBRARIES = const <String, LibraryInfo> {
111111
}
112112

113113
@override
114-
Future startServer({int? diagnosticPort, int? servicePort}) {
114+
Future<void> startServer({int? diagnosticPort, int? servicePort}) {
115115
var sdkPath = createNonStandardSdk();
116116
return server.start(
117117
diagnosticPort: diagnosticPort,
118118
dartSdkPath: sdkPath,
119119
servicePort: servicePort);
120120
}
121121

122-
Future test_getErrors() async {
122+
Future<void> test_getErrors() async {
123123
var pathname = sourcePath('test.dart');
124124
var text = r'''
125125
import 'dart:core';

0 commit comments

Comments
 (0)