merge

Author: kenzieschmoll

analysis_options.yaml

@@ -166,8 +166,6 @@ dart_code_metrics:
       - integration_test/**
       # Investigate internal usages of inspector_controller before removing.
       - lib/src/screens/inspector/**_controller.dart
-      - lib/src/extensions/**
-      - lib/src/framework/**
       - lib/src/service/**
       - lib/src/shared/**
       - lib/src/standalone_ui/**

packages/devtools_app/lib/src/extensions/embedded/_controller_web.dart

@@ -78,7 +78,7 @@ class EmbeddedExtensionControllerImpl extends EmbeddedExtensionController
   final extensionPostEventStream =
       StreamController<DevToolsExtensionEvent>.broadcast();
 
-    // ignore: unused-code, TODO(https://github.com/flutter/devtools/issues/9907): false positive.
+  // ignore: unused-code, TODO(https://github.com/flutter/devtools/issues/9907): false positive.
   bool _initialized = false;
 
   @override

packages/devtools_app/lib/src/framework/home_screen.dart

@@ -171,7 +171,7 @@ class _ConnectInputState extends State<ConnectInput> with BlockingActionMixin {
     // developers who tend to repeatedly restart DevTools to debug the same
     // test application.
     final uri = await storage.getValue(_debugVmServiceUriKey);
-    if (uri != null) {
+    if (uri != null && mounted) {
       setState(() {
         connectDialogController.text = uri;
       });
@@ -253,10 +253,9 @@ class _ConnectInputState extends State<ConnectInput> with BlockingActionMixin {
       return;
     }
 
-    assert(() {
+    if (kDebugMode) {
       safeUnawaited(storage.setValue(_debugVmServiceUriKey, uri));
-      return true;
-    }());
+    }
 
     // Cache the routerDelegate and notifications providers before the async
     // gap as the landing screen may not be displayed by the time the async gap

packages/devtools_app/lib/src/screens/accessibility/accessibility_screen.dart

@@ -34,7 +34,7 @@ class AccessibilityScreenBody extends StatefulWidget {
 
 class _AccessibilityScreenBodyState extends State<AccessibilityScreenBody>
     with AutoDisposeMixin {
-  // ignore: unused-code, temporarily ignore since this screen is under active development.   
+  // ignore: unused-code, temporarily ignore since this screen is under active development.
   late AccessibilityController controller;
 
   @override

packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart

@@ -289,6 +289,7 @@ class DiffTreeTypeDropdown extends StatelessWidget {
       height: defaultButtonHeight,
       child: RoundedDropDownButton<DiffTreeType>(
         key: AppSizeScreen.diffTypeDropdownKey,
+        value: value,
         isDense: true,
         items: [
           _buildDiffTreeTypeMenuItem(DiffTreeType.combined),

packages/devtools_app/lib/src/screens/dtd/dtd_tools_model.dart

@@ -18,10 +18,7 @@ abstract class FeatureController extends DisposableController
 /// [service] may be null if this service method is a first party service
 /// method registered by DTD or by a DTD-internal service.
 class DtdServiceMethod implements Comparable<DtdServiceMethod> {
-  const DtdServiceMethod({
-    required this.service,
-    required this.method,
-  });
+  const DtdServiceMethod({required this.service, required this.method});
 
   final String? service;
   final String method;

packages/devtools_app/lib/src/screens/dtd/services.dart

@@ -57,10 +57,7 @@ class ServicesController extends FeatureController {
       }),
       for (final service in response.clientServices) ...[
         for (final method in service.methods.values)
-          DtdServiceMethod(
-            service: service.name,
-            method: method.name,
-          ),
+          DtdServiceMethod(service: service.name, method: method.name),
       ],
     ];
   }

packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart

@@ -20,10 +20,7 @@ import '../layout_explorer/flex/flex.dart';
 /// Table for the widget's properties, along with its render object and a
 /// flex layout explorer if the widget is part of a flex layout.
 class DetailsTable extends StatefulWidget {
-  const DetailsTable({
-    super.key,
-    required this.controller,
-  });
+  const DetailsTable({super.key, required this.controller});
 
   static const gaPrefix = 'inspectorDetailsTable';
 

packages/devtools_app/lib/src/screens/logging/logging_controller.dart

@@ -233,6 +233,13 @@ class LoggingController extends DevToolsScreenController
 
   late final LogDetailsController logDetailsController;
 
+  /// Tracks the previous cumulative GC times (in seconds) for each active isolate.
+  ///
+  /// This is used to compute the actual duration of the current GC event (by taking
+  /// the delta between consecutive cumulative times), rather than displaying the
+  /// total cumulative GC time.
+  final _previousGcTimesByIsolate = <String, double>{};
+
   List<LogData> data = <LogData>[];
 
   final selectedLog = ValueNotifier<LogData?>(null);
@@ -281,6 +288,7 @@ class LoggingController extends DevToolsScreenController
 
   void clear() {
     _updateData([]);
+    _previousGcTimesByIsolate.clear();
     serviceConnection.errorBadgeManager.clearErrorCount(LoggingScreen.id);
   }
 
@@ -448,11 +456,24 @@ class LoggingController extends DevToolsScreenController
     final usedBytes = newSpace.used! + oldSpace.used!;
     final capacityBytes = newSpace.capacity! + oldSpace.capacity!;
 
-    final time = ((newSpace.time! + oldSpace.time!) * 1000).round();
+    final isolateId = e.isolate?.id;
+    // Cumulative time, in seconds.
+    final newCumulativeTime = newSpace.time! + oldSpace.time!;
+
+    String durationText = '';
+    if (isolateId != null) {
+      final previousGcTime = _previousGcTimesByIsolate[isolateId];
+      _previousGcTimesByIsolate[isolateId] = newCumulativeTime;
+      if (previousGcTime != null && newCumulativeTime >= previousGcTime) {
+        // Multiply by 1000 to display in milliseconds.
+        final durationMs = (newCumulativeTime - previousGcTime) * 1000;
+        durationText = ' in ${durationMs.toStringAsFixed(1)} ms';
+      }
+    }
 
     final summary =
         '${isolateRef['name']} • '
-        '${e.json!['reason']} collection in $time ms • '
+        '${e.json!['reason']} collection$durationText • '
         '${printBytes(usedBytes, unit: ByteUnit.mb, includeUnit: true)} used of '
         '${printBytes(capacityBytes, unit: ByteUnit.mb, includeUnit: true)}';
 

packages/devtools_app/lib/src/screens/network/network_screen.dart

@@ -319,9 +319,7 @@ class _NetworkProfilerBody extends StatelessWidget {
         ValueListenableBuilder<List<NetworkRequest>>(
           valueListenable: controller.filteredData,
           builder: (context, filteredRequests, _) {
-            return NetworkRequestsTable(
-              requests: filteredRequests
-            );
+            return NetworkRequestsTable(requests: filteredRequests);
           },
         ),
         const NetworkRequestInspector(),
@@ -331,10 +329,7 @@ class _NetworkProfilerBody extends StatelessWidget {
 }
 
 class NetworkRequestsTable extends StatelessWidget {
-  const NetworkRequestsTable({
-    super.key,
-    required this.requests,
-  });
+  const NetworkRequestsTable({super.key, required this.requests});
 
   static const methodColumn = MethodColumn();
   static final addressColumn = AddressColumn();