[flutter_tools] Refresh VM state before executing hot reload (#53960)

jason-simmons · web-flow · commit c663cd55a7a8 · 2020-04-07T15:41:02.000-07:00
diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart
@@ -825,6 +825,13 @@ abstract class ResidentRunner {
     await Future.wait(futures);
   }
 
+  Future<void> refreshVM() async {
+    final List<Future<void>> futures = <Future<void>>[
+      for (final FlutterDevice device in flutterDevices) device.getVMs(),
+    ];
+    await Future.wait(futures);
+  }
+
   Future<void> debugDumpApp() async {
     await refreshViews();
     for (final FlutterDevice device in flutterDevices) {
diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart
@@ -798,6 +798,7 @@ class HotRunner extends ResidentRunner {
 
     if (!_isPaused()) {
       globals.printTrace('Refreshing active FlutterViews before reloading.');
+      await refreshVM();
       await refreshViews();
     }
 
diff --git a/packages/flutter_tools/test/general.shard/resident_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_runner_test.dart
@@ -111,6 +111,7 @@ void main() {
       });
     when(mockFlutterDevice.vmService).thenReturn(mockVMService);
     when(mockFlutterDevice.refreshViews()).thenAnswer((Invocation invocation) async { });
+    when(mockFlutterDevice.getVMs()).thenAnswer((Invocation invocation) async { });
     when(mockFlutterDevice.reloadSources(any, pause: anyNamed('pause'))).thenReturn(<Future<Map<String, dynamic>>>[
       Future<Map<String, dynamic>>.value(<String, dynamic>{
         'type': 'ReloadReport',

Original file line number	Diff line number	Diff line change
`@@ -798,6 +798,7 @@ class HotRunner extends ResidentRunner {`
`798`	`798`
`799`	`799`	`if (!_isPaused()) {`
`800`	`800`	`globals.printTrace('Refreshing active FlutterViews before reloading.');`
	`801`	`+ await refreshVM();`
`801`	`802`	`await refreshViews();`
`802`	`803`	`}`
`803`	`804`