Merge branch 'master' into 2.45.1

elliette · web-flow · commit da724be7f6be · 2025-04-16T12:22:53.000-07:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -211,7 +211,9 @@ able to connect the DevTools web app to an IDE or another DevTools instance for
 
 To see the full list of arguments available for either command, please pass the `-h` flag.
 
-### DevTools + VS Code integration (IDE-embedded DevTools experience)
+### IDE-embedded DevTools experience
+
+#### DevTools + VS Code integration
 
 To test the integration with VS Code, you can set up the Dart VS Code extension to run DevTools
 and the server from your local source code. Follow the
@@ -244,6 +246,10 @@ Next, restart VS Code (or run the **Developer: Reload Window** command from the
 and DevTools will be run from your local source code. After making any code changes to DevTools or the
 server, you will need to re-run the **Developer: Reload Window** command to rebuild and restart the server.
 
+#### DevTools + IntelliJ integration
+
+Follow instructions in the Flutter-IntelliJ repo's `CONTRIBUTING` guide: [#developing-with-local-devtools](https://github.com/flutter/flutter-intellij/blob/master/CONTRIBUTING.md#developing-with-local-devtools)
+
 ## Testing for DevTools
 
 Please see [TESTING.md](TESTING.md) for guidance on running and writing tests.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -71,7 +71,7 @@ linter:
     # - constant_identifier_names # https://github.com/dart-lang/linter/issues/204
     - control_flow_in_finally
     - directives_ordering
-    # - discarded_futures # TODO(https://github.com/flutter/devtools/issues/9102): Re-enable.
+    - discarded_futures
     - empty_catches
     - empty_constructor_bodies
     - empty_statements
diff --git a/flutter-candidate.txt b/flutter-candidate.txt
@@ -1 +1 @@
-ceec33f16beaccf5e7a86099f0544ea52a327b28
+a7f820163c5d7d5321872c60f22fa047fb94bd7b
diff --git a/packages/devtools_app/lib/devtools.dart b/packages/devtools_app/lib/devtools.dart
@@ -10,4 +10,4 @@
 /// Note: a regexp in the `dt update-version' command logic matches the constant
 /// declaration `const version =`. If you change the declaration you must also
 /// modify the regex in the `dt update-version' command logic.
-const version = '2.45.1';
+const version = '2.46.0-dev.0';
diff --git a/packages/devtools_app/lib/src/framework/home_screen.dart b/packages/devtools_app/lib/src/framework/home_screen.dart
@@ -22,6 +22,7 @@ import '../shared/primitives/blocking_action_mixin.dart';
 import '../shared/primitives/utils.dart';
 import '../shared/title.dart';
 import '../shared/ui/vm_flag_widgets.dart';
+import '../shared/utils/utils.dart';
 import 'framework_core.dart';
 
 class HomeScreen extends Screen {
@@ -259,7 +260,7 @@ class _ConnectInputState extends State<ConnectInput> with BlockingActionMixin {
     }
 
     assert(() {
-      storage.setValue(_debugVmServiceUriKey, uri);
+      safeUnawaited(storage.setValue(_debugVmServiceUriKey, uri));
       return true;
     }());
 
diff --git a/packages/devtools_app/lib/src/screens/debugger/debugger_controller.dart b/packages/devtools_app/lib/src/screens/debugger/debugger_controller.dart
@@ -26,6 +26,7 @@ import '../../shared/framework/screen_controllers.dart';
 import '../../shared/globals.dart';
 import '../../shared/primitives/message_bus.dart';
 import '../../shared/primitives/utils.dart';
+import '../../shared/utils/utils.dart';
 import 'codeview_controller.dart';
 import 'debugger_model.dart';
 
@@ -399,9 +400,9 @@ class DebuggerController extends DevToolsScreenController
   /// This method ensures that the source for the script is populated in our
   /// cache, in order to reduce flashing in the editor view.
   void _populateScriptAndShowLocation(ScriptRef scriptRef) {
-    unawaited(
-      scriptManager.getScript(scriptRef).then((script) {
-        codeViewController.showScriptLocation(ScriptLocation(scriptRef));
+    safeUnawaited(
+      scriptManager.getScript(scriptRef).then((script) async {
+        await codeViewController.showScriptLocation(ScriptLocation(scriptRef));
       }),
     );
   }
diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart
@@ -34,6 +34,7 @@ import '../../shared/diagnostics/primitives/instance_ref.dart';
 import '../../shared/globals.dart';
 import '../../shared/primitives/query_parameters.dart';
 import '../../shared/primitives/utils.dart';
+import '../../shared/utils/utils.dart';
 import '../inspector_shared/inspector_screen.dart';
 import 'inspector_tree_controller.dart';
 
@@ -105,12 +106,14 @@ class InspectorController extends DisposableController
       // won't interfere with users.
       addAutoDisposeListener(_supportsToggleSelectWidgetMode, () {
         if (_supportsToggleSelectWidgetMode.value) {
-          serviceConnection.serviceManager.serviceExtensionManager
-              .setServiceExtensionState(
-                extensions.enableOnDeviceInspector.extension,
-                enabled: true,
-                value: true,
-              );
+          safeUnawaited(
+            serviceConnection.serviceManager.serviceExtensionManager
+                .setServiceExtensionState(
+                  extensions.enableOnDeviceInspector.extension,
+                  enabled: true,
+                  value: true,
+                ),
+          );
         }
       });
     }
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart b/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart
@@ -35,6 +35,7 @@ import '../../shared/globals.dart';
 import '../../shared/managers/notifications.dart';
 import '../../shared/primitives/query_parameters.dart';
 import '../../shared/primitives/utils.dart';
+import '../../shared/utils/utils.dart';
 import '../inspector_shared/inspector_screen.dart';
 import 'inspector_data_models.dart';
 import 'inspector_tree_controller.dart';
@@ -112,12 +113,14 @@ class InspectorController extends DisposableController
     // won't interfere with users.
     addAutoDisposeListener(_supportsToggleSelectWidgetMode, () {
       if (_supportsToggleSelectWidgetMode.value) {
-        serviceConnection.serviceManager.serviceExtensionManager
-            .setServiceExtensionState(
-              extensions.enableOnDeviceInspector.extension,
-              enabled: true,
-              value: true,
-            );
+        safeUnawaited(
+          serviceConnection.serviceManager.serviceExtensionManager
+              .setServiceExtensionState(
+                extensions.enableOnDeviceInspector.extension,
+                enabled: true,
+                value: true,
+              ),
+        );
       }
     });
 
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart b/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart
@@ -19,6 +19,7 @@ import '../../shared/managers/error_badge_manager.dart';
 import '../../shared/primitives/blocking_action_mixin.dart';
 import '../../shared/ui/common_widgets.dart';
 import '../../shared/ui/search.dart';
+import '../../shared/utils/utils.dart';
 import '../inspector_shared/inspector_controls.dart';
 import '../inspector_shared/inspector_screen.dart';
 import 'inspector_controller.dart';
@@ -97,7 +98,7 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
     addAutoDisposeListener(preferences.inspector.pubRootDirectories, () {
       if (serviceConnection.serviceManager.connectedState.value.connected &&
           controller.firstInspectorTreeLoadCompleted) {
-        controller.refreshInspector();
+        safeUnawaited(controller.refreshInspector());
       }
     });
 
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart b/packages/devtools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart
@@ -14,6 +14,7 @@ import '../../../../../service/service_extensions.dart' as extensions;
 import '../../../../../shared/globals.dart';
 import '../../../../../shared/primitives/utils.dart';
 import '../../../../../shared/ui/common_widgets.dart';
+import '../../../../../shared/utils/utils.dart';
 import '../performance_controls.dart';
 import 'enhance_tracing_controller.dart';
 
@@ -142,7 +143,7 @@ class _TraceWidgetBuildsSettingState extends State<TraceWidgetBuildsSetting>
     for (final type in TraceWidgetBuildsScope.values) {
       final extension = _traceWidgetBuildsExtensions[type]!;
 
-      unawaited(
+      safeUnawaited(
         serviceConnection.serviceManager.serviceExtensionManager
             .waitForServiceExtensionAvailable(extension.extension)
             .then((isServiceAvailable) {
@@ -154,9 +155,13 @@ class _TraceWidgetBuildsSettingState extends State<TraceWidgetBuildsSetting>
                     .serviceExtensionManager
                     .getServiceExtensionState(extension.extension);
 
-                _updateForServiceExtensionState(state.value, type);
+                safeUnawaited(
+                  _updateForServiceExtensionState(state.value, type),
+                );
                 addAutoDisposeListener(state, () {
-                  _updateForServiceExtensionState(state.value, type);
+                  safeUnawaited(
+                    _updateForServiceExtensionState(state.value, type),
+                  );
                 });
               }
             }),
diff --git a/packages/devtools_app/lib/src/service/vm_service_wrapper.dart b/packages/devtools_app/lib/src/service/vm_service_wrapper.dart
@@ -25,6 +25,7 @@ import '../screens/vm_developer/vm_service_private_extensions.dart';
 import '../shared/feature_flags.dart';
 import '../shared/globals.dart';
 import '../shared/primitives/utils.dart';
+import '../shared/utils/utils.dart';
 import 'json_to_service_cache.dart';
 
 final _log = Logger('vm_service_wrapper');
@@ -188,8 +189,8 @@ class VmServiceWrapper extends VmService {
   }
 
   @override
-  Future<Success> streamCancel(String streamId) {
-    _activeStreams.remove(streamId);
+  Future<Success> streamCancel(String streamId) async {
+    await _activeStreams.remove(streamId);
     return super.streamCancel(streamId);
   }
 
@@ -380,9 +381,11 @@ class VmServiceWrapper extends VmService {
       }
     }
 
-    localFuture.then(
-      (value) => futureComplete(),
-      onError: (error) => futureComplete(),
+    safeUnawaited(
+      localFuture.then(
+        (value) => futureComplete(),
+        onError: (error) => futureComplete(),
+      ),
     );
     return localFuture;
   }
diff --git a/packages/devtools_app/lib/src/shared/managers/survey.dart b/packages/devtools_app/lib/src/shared/managers/survey.dart
@@ -95,7 +95,7 @@ class SurveyService {
           allowDuplicates: false,
         );
         if (didPush) {
-          server.incrementSurveyShownCount();
+          safeUnawaited(server.incrementSurveyShownCount());
         }
       });
     }
diff --git a/packages/devtools_app/lib/src/shared/preferences/_extension_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_extension_preferences.dart
@@ -15,9 +15,11 @@ class ExtensionsPreferencesController extends DisposableController
   @override
   Future<void> init() async {
     addAutoDisposeListener(showOnlyEnabledExtensions, () {
-      storage.setValue(
-        _showOnlyEnabledExtensionsId,
-        showOnlyEnabledExtensions.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _showOnlyEnabledExtensionsId,
+          showOnlyEnabledExtensions.value.toString(),
+        ),
       );
       ga.select(
         gac.DevToolsExtensionEvents.extensionScreenId.name,
diff --git a/packages/devtools_app/lib/src/shared/preferences/_inspector_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_inspector_preferences.dart
@@ -168,9 +168,11 @@ class InspectorPreferencesController extends DisposableController
     await _updateInspectorDetailsViewSelection();
 
     addAutoDisposeListener(_defaultDetailsView, () {
-      storage.setValue(
-        _defaultDetailsViewStorageId,
-        _defaultDetailsView.value.name.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _defaultDetailsViewStorageId,
+          _defaultDetailsView.value.name.toString(),
+        ),
       );
     });
   }
diff --git a/packages/devtools_app/lib/src/shared/preferences/_logging_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_logging_preferences.dart
@@ -39,9 +39,11 @@ class LoggingPreferencesController extends DisposableController
         int.tryParse(await storage.getValue(_retentionLimitStorageId) ?? '') ??
         _defaultRetentionLimit;
     addAutoDisposeListener(retentionLimit, () {
-      storage.setValue(
-        _retentionLimitStorageId,
-        retentionLimit.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _retentionLimitStorageId,
+          retentionLimit.value.toString(),
+        ),
       );
       ga.select(
         gac.logging,
@@ -59,7 +61,9 @@ class LoggingPreferencesController extends DisposableController
         ) ??
         _defaultDetailsFormat;
     addAutoDisposeListener(detailsFormat, () {
-      storage.setValue(detailsFormatStorageId, detailsFormat.value.name);
+      safeUnawaited(
+        storage.setValue(detailsFormatStorageId, detailsFormat.value.name),
+      );
       ga.select(
         gac.logging,
         gac.LoggingEvents.changeDetailsFormat.name,
diff --git a/packages/devtools_app/lib/src/shared/preferences/_memory_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_memory_preferences.dart
@@ -26,9 +26,11 @@ class MemoryPreferencesController extends DisposableController
   @override
   Future<void> init() async {
     addAutoDisposeListener(androidCollectionEnabled, () {
-      storage.setValue(
-        _androidCollectionEnabledStorageId,
-        androidCollectionEnabled.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _androidCollectionEnabledStorageId,
+          androidCollectionEnabled.value.toString(),
+        ),
       );
       if (androidCollectionEnabled.value) {
         ga.select(gac.memory, gac.MemoryEvents.androidChart.name);
@@ -40,7 +42,9 @@ class MemoryPreferencesController extends DisposableController
     );
 
     addAutoDisposeListener(showChart, () {
-      storage.setValue(_showChartStorageId, showChart.value.toString());
+      safeUnawaited(
+        storage.setValue(_showChartStorageId, showChart.value.toString()),
+      );
 
       ga.select(
         gac.memory,
@@ -55,7 +59,9 @@ class MemoryPreferencesController extends DisposableController
     );
 
     addAutoDisposeListener(refLimit, () {
-      storage.setValue(_refLimitStorageId, refLimit.value.toString());
+      safeUnawaited(
+        storage.setValue(_refLimitStorageId, refLimit.value.toString()),
+      );
 
       ga.select(gac.memory, gac.MemoryEvents.browseRefLimit.name);
     });
diff --git a/packages/devtools_app/lib/src/shared/preferences/_performance_preferences.dart b/packages/devtools_app/lib/src/shared/preferences/_performance_preferences.dart
@@ -22,9 +22,11 @@ class PerformancePreferencesController extends DisposableController
   @override
   Future<void> init() async {
     addAutoDisposeListener(showFlutterFramesChart, () {
-      storage.setValue(
-        _showFlutterFramesChartId,
-        showFlutterFramesChart.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _showFlutterFramesChartId,
+          showFlutterFramesChart.value.toString(),
+        ),
       );
       ga.select(
         gac.performance,
@@ -38,9 +40,11 @@ class PerformancePreferencesController extends DisposableController
     );
 
     addAutoDisposeListener(includeCpuSamplesInTimeline, () {
-      storage.setValue(
-        _includeCpuSamplesInTimelineId,
-        includeCpuSamplesInTimeline.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _includeCpuSamplesInTimelineId,
+          includeCpuSamplesInTimeline.value.toString(),
+        ),
       );
       ga.select(
         gac.performance,
diff --git a/packages/devtools_app/lib/src/shared/preferences/preferences.dart b/packages/devtools_app/lib/src/shared/preferences/preferences.dart
@@ -135,9 +135,11 @@ class PreferencesController extends DisposableController
     ga.impression(gac.devToolsMain, gac.startingTheme(darkMode: useDarkMode));
     toggleDarkModeTheme(useDarkMode);
     addAutoDisposeListener(darkModeEnabled, () {
-      storage.setValue(
-        _UiPreferences.darkMode.storageKey,
-        '${darkModeEnabled.value}',
+      safeUnawaited(
+        storage.setValue(
+          _UiPreferences.darkMode.storageKey,
+          '${darkModeEnabled.value}',
+        ),
       );
     });
   }
@@ -149,9 +151,11 @@ class PreferencesController extends DisposableController
     );
     toggleVmDeveloperMode(vmDeveloperModeValue);
     addAutoDisposeListener(vmDeveloperModeEnabled, () {
-      storage.setValue(
-        _UiPreferences.vmDeveloperMode.storageKey,
-        '${vmDeveloperModeEnabled.value}',
+      safeUnawaited(
+        storage.setValue(
+          _UiPreferences.vmDeveloperMode.storageKey,
+          '${vmDeveloperModeEnabled.value}',
+        ),
       );
     });
   }
@@ -237,9 +241,11 @@ class PreferencesController extends DisposableController
     );
     toggleVerboseLogging(verboseLoggingEnabledValue);
     addAutoDisposeListener(verboseLoggingEnabled, () {
-      storage.setValue(
-        _GeneralPreferences.verboseLogging.name,
-        verboseLoggingEnabled.value.toString(),
+      safeUnawaited(
+        storage.setValue(
+          _GeneralPreferences.verboseLogging.name,
+          verboseLoggingEnabled.value.toString(),
+        ),
       );
     });
   }
diff --git a/packages/devtools_app/lib/src/shared/utils/utils.dart b/packages/devtools_app/lib/src/shared/utils/utils.dart
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
diff --git a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
diff --git a/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_developer_common_widgets_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_developer_common_widgets_test.dart
diff --git a/packages/devtools_app/test/test_infra/fixtures/networking_app/bin/main.dart b/packages/devtools_app/test/test_infra/fixtures/networking_app/bin/main.dart
diff --git a/packages/devtools_app_shared/test/ui/split_pane_test.dart b/packages/devtools_app_shared/test/ui/split_pane_test.dart
diff --git a/packages/devtools_shared/lib/src/service/service.dart b/packages/devtools_shared/lib/src/service/service.dart
diff --git a/tool/RELEASE_INSTRUCTIONS.md b/tool/RELEASE_INSTRUCTIONS.md

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ceec33f16beaccf5e7a86099f0544ea52a327b28`
	`1`	`+a7f820163c5d7d5321872c60f22fa047fb94bd7b`