Address review comments

Author: srujzs

dwds/lib/src/services/chrome_proxy_service.dart

@@ -473,8 +473,9 @@ class ChromeProxyService implements VmServiceInterface {
     if (!_isIsolateRunning) return;
     final isolate = inspector.isolate;
 
+    final debugger = await debuggerFuture;
     for (final breakpoint in isolate.breakpoints?.toList() ?? <Breakpoint>[]) {
-      await (await debuggerFuture).removeBreakpoint(breakpoint.id!);
+      await debugger.removeBreakpoint(breakpoint.id!);
     }
   }
 
@@ -1210,43 +1211,7 @@ class ChromeProxyService implements VmServiceInterface {
       returnByValue: true,
     );
 
-    if (pauseIsolatesOnStart) {
-      // If `pause_isolates_on_start` is enabled, pause and then the reload
-      // should finish later after the client removes breakpoints, reregisters
-      // breakpoints, and resumes.
-      _finishHotReloadOnResume = () async {
-        // Client finished setting breakpoints, called resume, and now the
-        // execution has resumed. Finish the hot reload so we start executing
-        // the new code instead.
-        _logger.info('Issuing \$dartHotReloadEndDwds request');
-        await inspector.jsEvaluate(
-          '\$dartHotReloadEndDwds();',
-          awaitPromise: true,
-        );
-        _logger.info('\$dartHotReloadEndDwds request complete.');
-      };
-
-      // Pause and wait for the pause to occur before managing breakpoints.
-      final pausedEvent = _firstStreamEvent(
-        'Debug',
-        EventKind.kPauseInterrupted,
-      );
-      await pause(isolateId);
-      await pausedEvent;
-
-      await _reinitializeForHotReload();
-
-      // This lets the client know that we're ready for breakpoint management
-      // and a resume.
-      _streamNotify(
-        'Debug',
-        Event(
-          kind: EventKind.kPausePostRequest,
-          timestamp: DateTime.now().millisecondsSinceEpoch,
-          isolate: inspector.isolateRef,
-        ),
-      );
-    } else {
+    if (!pauseIsolatesOnStart) {
       // Finish hot reload immediately.
       _logger.info('Issuing \$dartHotReloadEndDwds request');
       await inspector.jsEvaluate(
@@ -1257,7 +1222,40 @@ class ChromeProxyService implements VmServiceInterface {
       // TODO(srujzs): Supposedly Dart DevTools uses a kIsolateReload event
       // for breakpoints? We should confirm and add tests before sending the
       // event.
+      return;
     }
+    // If `pause_isolates_on_start` is enabled, pause and then the reload
+    // should finish later after the client removes breakpoints, reregisters
+    // breakpoints, and resumes.
+    _finishHotReloadOnResume = () async {
+      // Client finished setting breakpoints, called resume, and now the
+      // execution has resumed. Finish the hot reload so we start executing
+      // the new code instead.
+      _logger.info('Issuing \$dartHotReloadEndDwds request');
+      await inspector.jsEvaluate(
+        '\$dartHotReloadEndDwds();',
+        awaitPromise: true,
+      );
+      _logger.info('\$dartHotReloadEndDwds request complete.');
+    };
+
+    // Pause and wait for the pause to occur before managing breakpoints.
+    final pausedEvent = _firstStreamEvent('Debug', EventKind.kPauseInterrupted);
+    await pause(isolateId);
+    await pausedEvent;
+
+    await _reinitializeForHotReload();
+
+    // This lets the client know that we're ready for breakpoint management
+    // and a resume.
+    _streamNotify(
+      'Debug',
+      Event(
+        kind: EventKind.kPausePostRequest,
+        timestamp: DateTime.now().millisecondsSinceEpoch,
+        isolate: inspector.isolateRef,
+      ),
+    );
   }
 
   /// Performs a WebSocket-based hot reload by sending a request and waiting for a response.
@@ -1319,37 +1317,30 @@ class ChromeProxyService implements VmServiceInterface {
     String? step,
     int? frameIndex,
   }) async {
-    // If there is a hot restart or hot reload subscriber listening for a resume
-    // event after a hot restart or a hot reload, then add the event to the
-    // stream and skip processing it.
+    // If there is a subscriber listening for a resume event after hot-restart,
+    // then add the event to the stream and skip processing it.
     if (_resumeAfterRestartEventsController.hasListener) {
       _resumeAfterRestartEventsController.add(isolateId);
       return Success();
     }
-    Future<Success> resumeWhenAppHasStarted() {
-      return captureElapsedTime(() async {
+
+    if (inspector.appConnection.isStarted) {
+      await captureElapsedTime(() async {
         await isInitialized;
         await isStarted;
         _checkIsolate('resume', isolateId);
-        return await (await debuggerFuture).resume(
-          step: step,
-          frameIndex: frameIndex,
-        );
+        final debugger = await debuggerFuture;
+        return await debugger.resume(step: step, frameIndex: frameIndex);
       }, (result) => DwdsEvent.resume(step));
+    } else {
+      inspector.appConnection.runMain();
     }
-
+    // Finish the hot reload if needed.
     if (_finishHotReloadOnResume != null) {
-      await resumeWhenAppHasStarted();
       await _finishHotReloadOnResume!();
       _finishHotReloadOnResume = null;
-      return Success();
-    }
-    if (inspector.appConnection.isStarted) {
-      return resumeWhenAppHasStarted();
-    } else {
-      inspector.appConnection.runMain();
-      return Success();
     }
+    return Success();
   }
 
   /// This method is deprecated in vm_service package.

dwds/test/build_daemon_callstack_test.dart

@@ -22,7 +22,7 @@ void main() {
 
   group('shared context |', () {
     // Enable verbose logging for debugging.
-    final debug = false;
+    const debug = false;
 
     final project = TestProject.testPackage();
     final context = TestContext(project, provider);

dwds/test/build_daemon_circular_evaluate_test.dart

@@ -14,7 +14,7 @@ import 'fixtures/context.dart';
 
 void main() async {
   // Enable verbose logging for debugging.
-  final debug = false;
+  const debug = false;
 
   final provider = TestSdkConfigurationProvider(verbose: debug);
   tearDownAll(provider.dispose);

dwds/test/build_daemon_evaluate_test.dart

@@ -15,7 +15,7 @@ import 'fixtures/context.dart';
 
 void main() async {
   // Enable verbose logging for debugging.
-  final debug = false;
+  const debug = false;
 
   final provider = TestSdkConfigurationProvider(verbose: debug);
   tearDownAll(provider.dispose);

dwds/test/build_daemon_hot_restart_correctness_test.dart

@@ -16,7 +16,7 @@ import 'fixtures/context.dart';
 
 void main() {
   // Enable verbose logging for debugging.
-  final debug = false;
+  const debug = false;
   final canaryFeatures = false;
   final moduleFormat = ModuleFormat.amd;
   final compilationMode = CompilationMode.buildDaemon;

dwds/test/build_daemon_hot_restart_test.dart

@@ -16,7 +16,7 @@ import 'fixtures/context.dart';
 
 void main() {
   // Enable verbose logging for debugging.
-  final debug = false;
+  const debug = false;
   final canaryFeatures = false;
   final moduleFormat = ModuleFormat.amd;
   final compilationMode = CompilationMode.buildDaemon;

dwds/test/chrome_proxy_service_amd_test.dart

@@ -16,7 +16,7 @@ import 'fixtures/context.dart';
 
 void main() {
   // Enable verbose logging for debugging.
-  final debug = false;
+  const debug = false;
   final canaryFeatures = false;
   final moduleFormat = ModuleFormat.amd;
   final compilationMode = CompilationMode.buildDaemon;

dwds/test/chrome_proxy_service_ddc_library_bundle_test.dart

@@ -16,7 +16,7 @@ import 'fixtures/context.dart';
 
 void main() {
   // Enable verbose logging for debugging.
-  final debug = false;
+  const debug = false;
   final canaryFeatures = true;
   final moduleFormat = ModuleFormat.ddc;
   final compilationMode = CompilationMode.frontendServer;

dwds/test/common/hot_restart_common.dart

@@ -77,9 +77,8 @@ void runTests({
         completer.complete();
       }
     });
-    await completer.future.then((_) {
-      subscription.cancel();
-    });
+    await completer.future;
+    await subscription.cancel();
   }
 
   group(

dwds/test/execution_context_test.dart

@@ -20,7 +20,7 @@ import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
 import 'fixtures/fakes.dart';
 
 void main() async {
-  final debug = false;
+  const debug = false;
 
   group('ExecutionContext', () {
     setUpAll(() {