From da6e5297cae965adcd0dfab342c19ce4cd5eebed Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Tue, 14 Dec 2021 10:09:03 -0800 Subject: [PATCH] Add null return statements to nullable functions with implicit returns (#94760) --- packages/flutter/lib/src/services/restoration.dart | 2 +- packages/flutter/lib/src/widgets/actions.dart | 2 +- packages/flutter/lib/src/widgets/editable_text.dart | 6 +++--- packages/flutter/test/material/checkbox_test.dart | 1 + packages/flutter/test/rendering/rendering_tester.dart | 1 + packages/flutter/test/widgets/actions_test.dart | 9 ++++----- packages/flutter/test/widgets/clipboard_utils.dart | 1 + packages/flutter/test/widgets/router_test.dart | 1 + packages/flutter/test/widgets/shortcuts_test.dart | 1 + .../test/widgets/slotted_render_object_widget_test.dart | 2 +- packages/flutter/test/widgets/title_test.dart | 1 + 11 files changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/flutter/lib/src/services/restoration.dart b/packages/flutter/lib/src/services/restoration.dart index 5ca2731bddf..3ddedf18155 100644 --- a/packages/flutter/lib/src/services/restoration.dart +++ b/packages/flutter/lib/src/services/restoration.dart @@ -304,7 +304,7 @@ class RestorationManager extends ChangeNotifier { ); } - Future _methodHandler(MethodCall call) async { + Future _methodHandler(MethodCall call) async { switch (call.method) { case 'push': _parseAndHandleRestorationUpdateFromEngine(call.arguments as Map); diff --git a/packages/flutter/lib/src/widgets/actions.dart b/packages/flutter/lib/src/widgets/actions.dart index 42441068e35..a60027186d5 100644 --- a/packages/flutter/lib/src/widgets/actions.dart +++ b/packages/flutter/lib/src/widgets/actions.dart @@ -1489,7 +1489,7 @@ class PrioritizedAction extends Action { } @override - Object? invoke(PrioritizedIntents intent) { + void invoke(PrioritizedIntents intent) { assert(_selectedAction != null); assert(_selectedIntent != null); _selectedAction.invoke(_selectedIntent); diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart index 3a0ac65ce4f..f7518ca6b98 100644 --- a/packages/flutter/lib/src/widgets/editable_text.dart +++ b/packages/flutter/lib/src/widgets/editable_text.dart @@ -3741,13 +3741,13 @@ class _UpdateTextSelectionToAdjacentLineAction { final EditableTextState state; @override - Object? invoke(CopySelectionTextIntent intent, [BuildContext? context]) { + void invoke(CopySelectionTextIntent intent, [BuildContext? context]) { if (intent.collapseSelection) { state.cutSelection(intent.cause); } else { diff --git a/packages/flutter/test/material/checkbox_test.dart b/packages/flutter/test/material/checkbox_test.dart index cc4d9ee5aaa..2845fab5851 100644 --- a/packages/flutter/test/material/checkbox_test.dart +++ b/packages/flutter/test/material/checkbox_test.dart @@ -1077,6 +1077,7 @@ void main() { } return inactivePressedOverlayColor; } + return null; } const double splashRadius = 24.0; TestGesture gesture; diff --git a/packages/flutter/test/rendering/rendering_tester.dart b/packages/flutter/test/rendering/rendering_tester.dart index 818daeb8c21..65ba5ae80d7 100644 --- a/packages/flutter/test/rendering/rendering_tester.dart +++ b/packages/flutter/test/rendering/rendering_tester.dart @@ -305,6 +305,7 @@ class TestClipPaintingContext extends PaintingContext { ClipRectLayer? oldLayer, }) { this.clipBehavior = clipBehavior; + return null; } Clip clipBehavior = Clip.none; diff --git a/packages/flutter/test/widgets/actions_test.dart b/packages/flutter/test/widgets/actions_test.dart index d2c1f61da8d..c476ac5332d 100644 --- a/packages/flutter/test/widgets/actions_test.dart +++ b/packages/flutter/test/widgets/actions_test.dart @@ -1701,9 +1701,8 @@ class TestContextAction extends ContextAction { List capturedContexts = []; @override - Object? invoke(covariant TestIntent intent, [BuildContext? context]) { + void invoke(covariant TestIntent intent, [BuildContext? context]) { capturedContexts.add(context); - return null; } } @@ -1724,7 +1723,7 @@ class LogInvocationAction extends Action { bool get isActionEnabled => enabled; @override - Object? invoke(LogIntent intent) { + void invoke(LogIntent intent) { final Action? callingAction = this.callingAction; if (callingAction == null) { intent.log.add('$actionName.invoke'); @@ -1755,7 +1754,7 @@ class LogInvocationContextAction extends ContextAction { bool get isActionEnabled => enabled; @override - Object? invoke(LogIntent intent, [BuildContext? context]) { + void invoke(LogIntent intent, [BuildContext? context]) { invokeContext = context; final Action? callingAction = this.callingAction; if (callingAction == null) { @@ -1792,5 +1791,5 @@ class RedirectOutputAction extends LogInvocationAction { final List newLog; @override - Object? invoke(LogIntent intent) => super.invoke(LogIntent(log: newLog)); + void invoke(LogIntent intent) => super.invoke(LogIntent(log: newLog)); } diff --git a/packages/flutter/test/widgets/clipboard_utils.dart b/packages/flutter/test/widgets/clipboard_utils.dart index b7a27d0791b..1636148236c 100644 --- a/packages/flutter/test/widgets/clipboard_utils.dart +++ b/packages/flutter/test/widgets/clipboard_utils.dart @@ -29,5 +29,6 @@ class MockClipboard { _clipboardData = methodCall.arguments; break; } + return null; } } diff --git a/packages/flutter/test/widgets/router_test.dart b/packages/flutter/test/widgets/router_test.dart index 12b463cbe4a..0e0e1bf9ec2 100644 --- a/packages/flutter/test/widgets/router_test.dart +++ b/packages/flutter/test/widgets/router_test.dart @@ -792,6 +792,7 @@ testWidgets('ChildBackButtonDispatcher take priority recursively', (WidgetTester SystemChannels.navigation, (MethodCall methodCall) async { log.add(methodCall); + return null; } ); final RouteInformationProvider provider = PlatformRouteInformationProvider( diff --git a/packages/flutter/test/widgets/shortcuts_test.dart b/packages/flutter/test/widgets/shortcuts_test.dart index c4b5ef0e208..01ef2016ef2 100644 --- a/packages/flutter/test/widgets/shortcuts_test.dart +++ b/packages/flutter/test/widgets/shortcuts_test.dart @@ -103,6 +103,7 @@ Widget activatorTester( if (hasSecond) TestIntent2: TestAction(onInvoke: (Intent intent) { onInvoke2(intent); + return null; }), }, child: Shortcuts( diff --git a/packages/flutter/test/widgets/slotted_render_object_widget_test.dart b/packages/flutter/test/widgets/slotted_render_object_widget_test.dart index 7da4ae45a00..dace3b68113 100644 --- a/packages/flutter/test/widgets/slotted_render_object_widget_test.dart +++ b/packages/flutter/test/widgets/slotted_render_object_widget_test.dart @@ -212,7 +212,7 @@ class _Diagonal extends RenderObjectWidget with SlottedMultiChildRenderObjectWid Iterable<_DiagonalSlot> get slots => _DiagonalSlot.values; @override - Widget? childForSlot(Object slot) { + Widget? childForSlot(_DiagonalSlot slot) { switch (slot) { case _DiagonalSlot.topLeft: return topLeft; diff --git a/packages/flutter/test/widgets/title_test.dart b/packages/flutter/test/widgets/title_test.dart index 2fe657d4064..71dbf6f9e1c 100644 --- a/packages/flutter/test/widgets/title_test.dart +++ b/packages/flutter/test/widgets/title_test.dart @@ -38,6 +38,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget(Title(