From 1fdcb757fde4ab590844770e2c5d12d2434f873d Mon Sep 17 00:00:00 2001
From: Matan Lurey <matanlurey@users.noreply.github.com>
Date: Tue, 19 Nov 2024 16:11:39 -0800
Subject: [PATCH] Make `runner` non-nullable as it always is. (#159156)

---
 .../flutter_tools/lib/src/commands/attach.dart |  2 +-
 .../flutter_tools/lib/src/commands/daemon.dart | 18 +++++++++++-------
 .../flutter_tools/lib/src/commands/run.dart    |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/flutter_tools/lib/src/commands/attach.dart b/packages/flutter_tools/lib/src/commands/attach.dart
index 2ad5dc1632..c5b4dd6501 100644
--- a/packages/flutter_tools/lib/src/commands/attach.dart
+++ b/packages/flutter_tools/lib/src/commands/attach.dart
@@ -372,7 +372,7 @@ known, it can be explicitly provided to attach via the command-line, e.g.
         } on Exception catch (error) {
           throwToolExit(error.toString());
         }
-        result = await app.runner!.waitForAppToFinish();
+        result = await app.runner.waitForAppToFinish();
         return;
       }
       while (true) {
diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart
index 6749b988fe..98e81cf1c4 100644
--- a/packages/flutter_tools/lib/src/commands/daemon.dart
+++ b/packages/flutter_tools/lib/src/commands/daemon.dart
@@ -902,7 +902,7 @@ class AppDomain extends Domain {
     if (app == null) {
       throw DaemonException("app '$appId' not found");
     }
-    final FlutterDevice device = app.runner!.flutterDevices.first;
+    final FlutterDevice device = app.runner.flutterDevices.first;
     final List<FlutterView> views = await device.vmService!.getFlutterViews();
     final Map<String, Object?>? result = await device
       .vmService!
@@ -1550,20 +1550,24 @@ class NotifyingLogger extends DelegatingLogger {
 
 /// A running application, started by this daemon.
 class AppInstance {
-  AppInstance(this.id, { this.runner, this.logToStdout = false, required AppRunLogger logger })
-    : _logger = logger;
+  AppInstance(
+    this.id, {
+    required this.runner,
+    this.logToStdout = false,
+    required AppRunLogger logger,
+  }) : _logger = logger;
 
   final String id;
-  final ResidentRunner? runner;
+  final ResidentRunner runner;
   final bool logToStdout;
   final AppRunLogger _logger;
 
   Future<OperationResult> restart({ bool fullRestart = false, bool pause = false, String? reason }) {
-    return runner!.restart(fullRestart: fullRestart, pause: pause, reason: reason);
+    return runner.restart(fullRestart: fullRestart, pause: pause, reason: reason);
   }
 
-  Future<void> stop() => runner!.exit();
-  Future<void> detach() => runner!.detach();
+  Future<void> stop() => runner.exit();
+  Future<void> detach() => runner.detach();
 
   void closeLogger() {
     _logger.close();
diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart
index 4b9cb710bf..f2e6d16474 100644
--- a/packages/flutter_tools/lib/src/commands/run.dart
+++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -771,7 +771,7 @@ class RunCommand extends RunCommandBase {
         throwToolExit(error.toString());
       }
       final DateTime appStartedTime = globals.systemClock.now();
-      final int result = await app.runner!.waitForAppToFinish();
+      final int result = await app.runner.waitForAppToFinish();
       if (result != 0) {
         throwToolExit(null, exitCode: result);
       }