Skip to content

Commit e774227

Browse files
srawlinsCommit Bot
srawlins
authored and
Commit Bot
committed
analysis_server: Remove implicit casts from test and tool
Bug: #41651 Change-Id: I0a165aef2b5d5cd2f97e5728bb6011a8eb70d9a5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/222041 Reviewed-by: Konstantin Shcheglov <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 2206b69 commit e774227

15 files changed

+58
-58
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,12 @@ main() {
6767
);
6868
}
6969

70-
void _assertHasChange(String message, String expectedCode, [Function? cmp]) {
70+
void _assertHasChange(String message, String expectedCode) {
7171
if (change.message == message) {
7272
if (change.edits.isNotEmpty) {
7373
var resultCode =
7474
SourceEdit.applySequence(testCode, change.edits[0].edits);
7575
expect(resultCode, expectedCode.replaceAll('/*caret*/', ''));
76-
if (cmp != null) {
77-
int offset = cmp(resultCode);
78-
expect(change.selection!.offset, offset);
79-
}
80-
} else {
81-
if (cmp != null) {
82-
int offset = cmp(testCode);
83-
expect(change.selection!.offset, offset);
84-
}
8576
}
8677
return;
8778
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,20 @@ main() {
101101
(s) => s.indexOf(match) + match.length); // Ensure cursor after '='.
102102
}
103103

104-
void _assertHasChange(String message, String expectedCode, [Function? cmp]) {
104+
void _assertHasChange(String message, String expectedCode,
105+
[int Function(String)? cmp]) {
105106
if (change.message == message) {
106107
if (change.edits.isNotEmpty) {
107108
var resultCode =
108109
SourceEdit.applySequence(testCode, change.edits[0].edits);
109110
expect(resultCode, expectedCode.replaceAll('/*caret*/', ''));
110111
if (cmp != null) {
111-
int offset = cmp(resultCode);
112+
var offset = cmp(resultCode);
112113
expect(change.selection!.offset, offset);
113114
}
114115
} else {
115116
if (cmp != null) {
116-
int offset = cmp(testCode);
117+
var offset = cmp(testCode);
117118
expect(change.selection!.offset, offset);
118119
}
119120
}

‎pkg/analysis_server/test/mocks.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ class _IsResponseFailure extends Matcher {
155155
}
156156

157157
@override
158-
Description describeMismatch(
159-
item, Description mismatchDescription, Map matchState, bool verbose) {
160-
Response response = item;
158+
Description describeMismatch(Object? item, Description mismatchDescription,
159+
Map matchState, bool verbose) {
160+
var response = item as Response;
161161
var id = response.id;
162162
var error = response.error;
163163
mismatchDescription.add('has identifier "$id"');
@@ -170,8 +170,8 @@ class _IsResponseFailure extends Matcher {
170170
}
171171

172172
@override
173-
bool matches(item, Map matchState) {
174-
Response response = item;
173+
bool matches(Object? item, Map matchState) {
174+
var response = item as Response;
175175
var error = response.error;
176176
if (response.id != _id || error == null) {
177177
return false;
@@ -196,9 +196,9 @@ class _IsResponseSuccess extends Matcher {
196196
}
197197

198198
@override
199-
Description describeMismatch(
200-
item, Description mismatchDescription, Map matchState, bool verbose) {
201-
Response? response = item;
199+
Description describeMismatch(Object? item, Description mismatchDescription,
200+
Map matchState, bool verbose) {
201+
var response = item as Response?;
202202
if (response == null) {
203203
mismatchDescription.add('is null response');
204204
} else {
@@ -213,8 +213,8 @@ class _IsResponseSuccess extends Matcher {
213213
}
214214

215215
@override
216-
bool matches(item, Map matchState) {
217-
Response? response = item;
216+
bool matches(Object? item, Map matchState) {
217+
var response = item as Response?;
218218
return response != null && response.id == _id && response.error == null;
219219
}
220220
}

‎pkg/analysis_server/test/mocks_lsp.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ class MockLspServerChannel implements LspServerCommunicationChannel {
191191
/// than the maps as they would be (the server expects to do the conversion).
192192
T _convertJson<T>(
193193
lsp.ToJsonable message, T Function(Map<String, dynamic>) constructor) {
194-
return constructor(jsonDecode(jsonEncode(message.toJson())));
194+
return constructor(
195+
jsonDecode(jsonEncode(message.toJson())) as Map<String, Object?>);
195196
}
196197
}

‎pkg/analysis_server/test/services/completion/postfix/postfix_completion_test.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,20 @@ class PostfixCompletionTest extends AbstractSingleUnitTest {
2828
late PostfixCompletionProcessor processor;
2929
late SourceChange change;
3030

31-
void _assertHasChange(String message, String expectedCode, [Function? cmp]) {
31+
void _assertHasChange(String message, String expectedCode,
32+
[int Function(String)? cmp]) {
3233
if (change.message == message) {
3334
if (change.edits.isNotEmpty) {
3435
var resultCode =
3536
SourceEdit.applySequence(testCode, change.edits[0].edits);
3637
expect(resultCode, expectedCode.replaceAll('/*caret*/', ''));
3738
if (cmp != null) {
38-
int offset = cmp(resultCode);
39+
var offset = cmp(resultCode);
3940
expect(change.selection!.offset, offset);
4041
}
4142
} else {
4243
if (cmp != null) {
43-
int offset = cmp(testCode);
44+
var offset = cmp(testCode);
4445
expect(change.selection!.offset, offset);
4546
}
4647
}

‎pkg/analysis_server/test/src/cider/rename_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ void foo(String ^a) {
221221
);
222222
}
223223

224-
RenameResponse? _rename(String content, newName) {
224+
RenameResponse? _rename(String content, String newName) {
225225
_updateFile(content);
226226

227227
return CiderRenameComputer(

‎pkg/analysis_server/test/src/computer/outline_computer_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ MyWidget
123123
void writeOutline(Outline outline, String indent) {
124124
buffer.write(indent);
125125
buffer.writeln(outline.element.name);
126-
for (var child in outline.children ?? const []) {
126+
for (var child in outline.children ?? const <Outline>[]) {
127127
writeOutline(child, '$indent ');
128128
}
129129
}

‎pkg/analysis_server/test/src/domain_abstract_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analysis_server/src/analysis_server.dart';
56
import 'package:analysis_server/src/domain_abstract.dart';
67
import 'package:analysis_server/src/plugin/plugin_manager.dart';
78
import 'package:analysis_server/src/protocol_server.dart' hide Element;
@@ -92,7 +93,7 @@ class AbstractRequestHandlerTest extends AbstractAnalysisTest {
9293
}
9394

9495
class TestAbstractRequestHandler extends AbstractRequestHandler {
95-
TestAbstractRequestHandler(server) : super(server);
96+
TestAbstractRequestHandler(AnalysisServer server) : super(server);
9697

9798
@override
9899
Response handleRequest(Request request) {

‎pkg/analysis_server/test/stress/completion/completion.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ void main(List<String> args) async {
1818

1919
var runner = CompletionRunner(
2020
output: stdout,
21-
printMissing: result['missing'],
22-
printQuality: result['quality'],
23-
timing: result['timing'],
24-
verbose: result['verbose']);
21+
printMissing: result['missing'] as bool?,
22+
printQuality: result['quality'] as bool?,
23+
timing: result['timing'] as bool?,
24+
verbose: result['verbose'] as bool?);
2525
await runner.runAll(analysisRoot);
2626
await stdout.flush();
2727
}

‎pkg/analysis_server/test/stress/replay/replay.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,19 +260,19 @@ class Driver {
260260
return false;
261261
}
262262

263-
if (results[HELP_FLAG_NAME]) {
263+
if (results[HELP_FLAG_NAME] as bool) {
264264
_showUsage(parser);
265265
return false;
266266
}
267267

268-
String overlayStyleValue = results[OVERLAY_STYLE_OPTION_NAME];
268+
var overlayStyleValue = results[OVERLAY_STYLE_OPTION_NAME] as String;
269269
if (overlayStyleValue == CHANGE_OVERLAY_STYLE) {
270270
overlayStyle = OverlayStyle.change;
271271
} else if (overlayStyleValue == MULTIPLE_ADD_OVERLAY_STYLE) {
272272
overlayStyle = OverlayStyle.multipleAdd;
273273
}
274274

275-
if (results[VERBOSE_FLAG_NAME]) {
275+
if (results[VERBOSE_FLAG_NAME] as bool) {
276276
verbose = true;
277277
logger = Logger(stdout);
278278
}

‎pkg/analysis_server/tool/bulk_fix/supported_diagnostics.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ Future<void> main() async {
1616
var hintEntries = FixProcessor.nonLintProducerMap.entries.where((e) =>
1717
e.key.type == ErrorType.HINT || e.key.type == ErrorType.STATIC_WARNING);
1818

19-
var diagnostics = List.from(hintEntries)
20-
..addAll(FixProcessor.lintProducerMap.entries);
19+
var diagnostics = [
20+
...hintEntries,
21+
...FixProcessor.lintProducerMap.entries,
22+
];
2123
for (var diagnostic in diagnostics) {
2224
var canBeAppliedInBulk = false;
2325
var missingExplanations = <String>[];

‎pkg/analysis_server/tool/code_completion/completion_metrics.dart

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Future<void> main(List<String> args) async {
9494
var provider = PhysicalResourceProvider.INSTANCE;
9595
if (result.wasParsed('reduceDir')) {
9696
var targetMetrics = <CompletionMetrics>[];
97-
var dir = provider.getFolder(result['reduceDir']);
97+
var dir = provider.getFolder(result['reduceDir'] as String);
9898
var computer = CompletionMetricsComputer('', options);
9999
for (var child in dir.getChildren()) {
100100
if (child is File) {
@@ -239,7 +239,7 @@ bool validArguments(ArgParser parser, ArgResults result) {
239239
printUsage(parser);
240240
return false;
241241
} else if (result.wasParsed('reduceDir')) {
242-
return validateDir(parser, result['reduceDir']);
242+
return validateDir(parser, result['reduceDir'] as String);
243243
} else if (result.rest.length != 1) {
244244
printUsage(parser, error: 'No package path specified.');
245245
return false;
@@ -402,13 +402,14 @@ class CompletionMetrics {
402402
in (map['groupMrrComputers'] as Map<String, dynamic>).entries) {
403403
var group = CompletionGroup.values[int.parse(entry.key)];
404404
metrics.groupMrrComputers[group] = MeanReciprocalRankComputer(group.name)
405-
..fromJson(entry.value);
405+
..fromJson(entry.value as Map<String, Object?>);
406406
}
407407
for (var entry
408408
in (map['locationMrrComputers'] as Map<String, dynamic>).entries) {
409409
var location = entry.key;
410410
metrics.locationMrrComputers[location] =
411-
MeanReciprocalRankComputer(location)..fromJson(entry.value);
411+
MeanReciprocalRankComputer(location)
412+
..fromJson(entry.value as Map<String, Object?>);
412413
}
413414
metrics.charsBeforeTop
414415
.fromJson(map['charsBeforeTop'] as Map<String, dynamic>);
@@ -417,11 +418,11 @@ class CompletionMetrics {
417418
metrics.insertionLengthTheoretical
418419
.fromJson(map['insertionLengthTheoretical'] as Map<String, dynamic>);
419420
for (var element in map['missingCompletionLocations'] as List<dynamic>) {
420-
metrics.missingCompletionLocations.add(element);
421+
metrics.missingCompletionLocations.add(element as String);
421422
}
422423
for (var element
423424
in map['missingCompletionLocationTables'] as List<dynamic>) {
424-
metrics.missingCompletionLocationTables.add(element);
425+
metrics.missingCompletionLocationTables.add(element as String);
425426
}
426427
for (var entry in (map['slowestResults'] as Map<String, dynamic>).entries) {
427428
var group = CompletionGroup.values[int.parse(entry.key)];
@@ -1669,15 +1670,17 @@ class CompletionMetricsOptions {
16691670

16701671
factory CompletionMetricsOptions(results) {
16711672
return CompletionMetricsOptions._(
1672-
overlay: results[OVERLAY],
1673-
printMissedCompletionDetails: results[PRINT_MISSED_COMPLETION_DETAILS],
1674-
printMissedCompletionSummary: results[PRINT_MISSED_COMPLETION_SUMMARY],
1675-
printMissingInformation: results[PRINT_MISSING_INFORMATION],
1676-
printMrrByLocation: results[PRINT_MRR_BY_LOCATION],
1673+
overlay: results[OVERLAY] as String,
1674+
printMissedCompletionDetails:
1675+
results[PRINT_MISSED_COMPLETION_DETAILS] as bool,
1676+
printMissedCompletionSummary:
1677+
results[PRINT_MISSED_COMPLETION_SUMMARY] as bool,
1678+
printMissingInformation: results[PRINT_MISSING_INFORMATION] as bool,
1679+
printMrrByLocation: results[PRINT_MRR_BY_LOCATION] as bool,
16771680
printShadowedCompletionDetails:
1678-
results[PRINT_SHADOWED_COMPLETION_DETAILS],
1679-
printSlowestResults: results[PRINT_SLOWEST_RESULTS],
1680-
printWorstResults: results[PRINT_WORST_RESULTS]);
1681+
results[PRINT_SHADOWED_COMPLETION_DETAILS] as bool,
1682+
printSlowestResults: results[PRINT_SLOWEST_RESULTS] as bool,
1683+
printWorstResults: results[PRINT_WORST_RESULTS] as bool);
16811684
}
16821685

16831686
CompletionMetricsOptions._(

‎pkg/analysis_server/tool/code_completion/implicit_type_declarations.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Future<void> main(List<String> args) async {
3131
var computer = ImpliedTypeComputer();
3232
var stopwatch = Stopwatch();
3333
stopwatch.start();
34-
await computer.compute(rootPath, verbose: result['verbose']);
34+
await computer.compute(rootPath, verbose: result['verbose'] as bool);
3535
stopwatch.stop();
3636

3737
var duration = Duration(milliseconds: stopwatch.elapsedMilliseconds);

‎pkg/analysis_server/tool/code_completion/relevance_metrics.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Future<void> main(List<String> args) async {
5151
var computer = RelevanceMetricsComputer();
5252
var stopwatch = Stopwatch();
5353
stopwatch.start();
54-
await computer.compute(rootPath, verbose: result['verbose']);
54+
await computer.compute(rootPath, verbose: result['verbose'] as bool);
5555
stopwatch.stop();
5656

5757
var duration = Duration(milliseconds: stopwatch.elapsedMilliseconds);

‎pkg/analysis_server/tool/code_completion/relevance_table_generator.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Future<void> main(List<String> args) async {
5959

6060
if (result.wasParsed('reduceDir')) {
6161
var data = RelevanceData();
62-
var dir = provider.getFolder(result['reduceDir']);
62+
var dir = provider.getFolder(result['reduceDir'] as String);
6363
var suffix = result.rest.isNotEmpty ? result.rest[0] : '';
6464
for (var child in dir.getChildren()) {
6565
if (child is File) {
@@ -76,7 +76,7 @@ Future<void> main(List<String> args) async {
7676

7777
var computer = RelevanceMetricsComputer();
7878
var stopwatch = Stopwatch()..start();
79-
await computer.compute(rootPath, verbose: result['verbose']);
79+
await computer.compute(rootPath, verbose: result['verbose'] as bool);
8080
if (result.wasParsed('mapFile')) {
8181
var mapFile = provider.getFile(result['mapFile'] as String);
8282
mapFile.writeAsStringSync(computer.data.toJson());
@@ -139,7 +139,7 @@ bool validArguments(ArgParser parser, ArgResults result) {
139139
printUsage(parser);
140140
return false;
141141
} else if (result.wasParsed('reduceDir')) {
142-
return validateDir(parser, result['reduceDir']);
142+
return validateDir(parser, result['reduceDir'] as String);
143143
} else if (result.rest.length != 1) {
144144
printUsage(parser, error: 'No package path specified.');
145145
return false;

0 commit comments

Comments
 (0)