Skip to content

Commit d0c0439

Browse files
authored
fixes to anticipate next Dart linter release (#127211)
The upcoming linter release notices null literals as unnecessary argument values and flags more `type_literal_in_constant_pattern` cases. See breakages: https://logs.chromium.org/logs/dart/buildbucket/cr-buildbucket/8780744067138629361/+/u/analyze_flutter_flutter/stdout
1 parent e8b7889 commit d0c0439

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

dev/benchmarks/macrobenchmarks/lib/src/web/bench_mouse_region_grid_hover.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ abstract final class _UntilNextFrame {
123123
if (_UntilNextFrame._completer == null) {
124124
_UntilNextFrame._completer = Completer<void>();
125125
SchedulerBinding.instance.addPostFrameCallback((_) {
126-
_UntilNextFrame._completer!.complete(null);
126+
_UntilNextFrame._completer!.complete();
127127
_UntilNextFrame._completer = null;
128128
});
129129
}

dev/benchmarks/macrobenchmarks/lib/src/web/bench_mouse_region_grid_scroll.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ abstract final class _UntilNextFrame {
9595
if (_UntilNextFrame._completer == null) {
9696
_UntilNextFrame._completer = Completer<void>();
9797
SchedulerBinding.instance.addPostFrameCallback((_) {
98-
_UntilNextFrame._completer!.complete(null);
98+
_UntilNextFrame._completer!.complete();
9999
_UntilNextFrame._completer = null;
100100
});
101101
}

dev/benchmarks/macrobenchmarks/lib/src/web/bench_mouse_region_mixed_grid_hover.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class _UntilNextFrame {
147147
if (_UntilNextFrame._completer == null) {
148148
_UntilNextFrame._completer = Completer<void>();
149149
SchedulerBinding.instance.addPostFrameCallback((_) {
150-
_UntilNextFrame._completer!.complete(null);
150+
_UntilNextFrame._completer!.complete();
151151
_UntilNextFrame._completer = null;
152152
});
153153
}

packages/flutter/lib/src/painting/image_provider.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ abstract class ImageProvider<T extends Object> {
448448
exception: exception,
449449
stack: stack,
450450
));
451-
completer.complete(null);
451+
completer.complete();
452452
}
453453
},
454454
);

packages/flutter/test/material/scaffold_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2569,7 +2569,7 @@ void main() {
25692569
),
25702570
TextButton(
25712571
onPressed: () {
2572-
Navigator.pop(context, null);
2572+
Navigator.pop(context);
25732573
},
25742574
child: const Text('Pop route'),
25752575
),

packages/flutter/test/widgets/root_restoration_scope_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ void main() {
319319
expect(binding.restorationManager.rootBucketAccessed, 1);
320320
expect(find.text('Hello'), findsNothing);
321321

322-
completer.complete(null);
322+
completer.complete();
323323
await tester.pump(const Duration(milliseconds: 100));
324324

325325
expect(binding.restorationManager.rootBucketAccessed, 1);

packages/flutter_test/lib/src/matchers.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,10 +1624,10 @@ class _MatchAnythingExceptClip extends _FailWithDescriptionMatcher {
16241624
final RenderObject renderObject = nodes.single.renderObject!;
16251625

16261626
switch (renderObject.runtimeType) {
1627-
case RenderClipPath:
1628-
case RenderClipOval:
1629-
case RenderClipRect:
1630-
case RenderClipRRect:
1627+
case const (RenderClipPath):
1628+
case const (RenderClipOval):
1629+
case const (RenderClipRect):
1630+
case const (RenderClipRRect):
16311631
return failWithDescription(matchState, 'had a root render object of type: ${renderObject.runtimeType}');
16321632
default:
16331633
return true;

packages/flutter_test/lib/src/test_pointer.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ class TestPointer {
100100
_buttons = buttons;
101101
}
102102
switch (event.runtimeType) {
103-
case PointerDownEvent:
103+
case const (PointerDownEvent):
104104
assert(!isDown);
105105
_isDown = true;
106-
case PointerUpEvent:
107-
case PointerCancelEvent:
106+
case const (PointerUpEvent):
107+
case const (PointerCancelEvent):
108108
assert(isDown);
109109
_isDown = false;
110110
default:

packages/flutter_tools/lib/src/compile.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class StdoutHandler {
114114
}
115115
}
116116
if (message.length <= messageBoundaryKey.length) {
117-
compilerOutput?.complete(null);
117+
compilerOutput?.complete();
118118
return;
119119
}
120120
final int spaceDelimiter = message.lastIndexOf(' ');
@@ -809,7 +809,7 @@ class DefaultResidentCompiler implements ResidentCompiler {
809809
// when outputFilename future is not completed, but stdout is closed
810810
// process has died unexpectedly.
811811
if (_stdoutHandler.compilerOutput?.isCompleted == false) {
812-
_stdoutHandler.compilerOutput?.complete(null);
812+
_stdoutHandler.compilerOutput?.complete();
813813
throwToolExit('the Dart compiler exited unexpectedly.');
814814
}
815815
});

packages/flutter_tools/lib/src/custom_devices/custom_device.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class CustomDevicePortForwarder extends DevicePortForwarder {
184184
// a port forwarding failure and we complete with a null value.
185185
unawaited(process.exitCode.whenComplete(() {
186186
if (!completer.isCompleted) {
187-
completer.complete(null);
187+
completer.complete();
188188
}
189189
}));
190190

packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ void main() {
368368
await FakeAsync().run((FakeAsync time) {
369369
unawaited(FakeAsyncCrashingDoctor(time, logger).diagnose(verbose: false).then((bool r) {
370370
expect(r, isFalse);
371-
completer.complete(null);
371+
completer.complete();
372372
}));
373373
time.elapse(const Duration(seconds: 1));
374374
time.flushMicrotasks();

packages/flutter_tools/test/general.shard/base/async_guard_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ void main() {
176176
caughtByHandler = true;
177177
}
178178
if (!completer.isCompleted) {
179-
completer.complete(null);
179+
completer.complete();
180180
}
181181
}, (Object e, StackTrace s) {
182182
caughtByZone = true;
183183
if (!completer.isCompleted) {
184-
completer.complete(null);
184+
completer.complete();
185185
}
186186
}));
187187
time.elapse(const Duration(seconds: 1));
@@ -214,12 +214,12 @@ void main() {
214214
caughtByHandler = true;
215215
}
216216
if (!completer.isCompleted) {
217-
completer.complete(null);
217+
completer.complete();
218218
}
219219
}, (Object e, StackTrace s) {
220220
caughtByZone = true;
221221
if (!completer.isCompleted) {
222-
completer.complete(null);
222+
completer.complete();
223223
}
224224
}));
225225
time.elapse(const Duration(seconds: 1));
@@ -252,12 +252,12 @@ void main() {
252252
caughtByHandler = true;
253253
}
254254
if (!completer.isCompleted) {
255-
completer.complete(null);
255+
completer.complete();
256256
}
257257
}, (Object e, StackTrace s) {
258258
caughtByZone = true;
259259
if (!completer.isCompleted) {
260-
completer.complete(null);
260+
completer.complete();
261261
}
262262
}));
263263
time.elapse(const Duration(seconds: 1));
@@ -292,12 +292,12 @@ void main() {
292292
caughtByHandler = true;
293293
}
294294
if (!completer.isCompleted) {
295-
completer.complete(null);
295+
completer.complete();
296296
}
297297
}, (Object e, StackTrace s) {
298298
caughtByZone = true;
299299
if (!completer.isCompleted) {
300-
completer.complete(null);
300+
completer.complete();
301301
}
302302
}));
303303
time.elapse(const Duration(seconds: 1));

packages/flutter_tools/test/general.shard/compile_batch_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void main() {
126126
packageConfig: PackageConfig.empty,
127127
packagesPath: '.packages',
128128
);
129-
stdoutHandler.compilerOutput?.complete(null);
129+
stdoutHandler.compilerOutput?.complete();
130130
completer.complete();
131131

132132
expect(await output, null);

0 commit comments

Comments
 (0)