flutter · kenzieschmoll · Oct 23, 2023 · Jun 25, 2023 · Jun 25, 2023 · Jun 25, 2023
@@ -264,7 +264,6 @@ class _NotificationState extends State<_Notification>
                           Flexible(
                             child: _NotificationMessage(
                               widget: widget,
-                              context: context,
                             ),
                           ),
                           _DismissAction(
@@ -276,7 +275,6 @@ class _NotificationState extends State<_Notification>
                       )
                     : _NotificationMessage(
                         widget: widget,
-                        context: context,
                       ),
                 const SizedBox(height: defaultSpacing),
                 _NotificationActions(widget: widget),
@@ -313,11 +311,9 @@ class _DismissAction extends StatelessWidget {
 class _NotificationMessage extends StatelessWidget {
   const _NotificationMessage({
     required this.widget,
-    required this.context,
   });
 
   final _Notification widget;
-  final BuildContext context;
 
   @override
   Widget build(BuildContext context) {

@@ -54,8 +54,6 @@ class CodeView extends StatefulWidget {
     this.lineRange,
     this.initialPosition,
     this.onSelected,
-    this.enableFileExplorer = true,
-    this.enableSearch = true,
     this.enableHistory = true,
   }) : super(key: key);
 
@@ -78,8 +76,6 @@ class CodeView extends StatefulWidget {
   // the script's source in its entirety, with lines outside of the range being
   // rendered as if they have been greyed out.
   final LineRange? lineRange;
-  final bool enableFileExplorer;
-  final bool enableSearch;
   final bool enableHistory;
 
   final void Function(ScriptRef scriptRef, int line)? onSelected;

@@ -59,10 +59,7 @@ class InspectorController extends DisposableController
     _refreshRateLimiter = RateLimiter(refreshFramesPerSecond, refresh);
 
     inspectorTree.config = InspectorTreeConfig(
-      summaryTree: isSummaryTree,
-      treeType: treeType,
       onNodeAdded: _onNodeAdded,
-      onHover: highlightShowNode,
       onSelectionChange: selectionChanged,
       onExpand: _onExpand,
       onClientActiveChange: _onClientChange,
@@ -499,10 +496,6 @@ class InspectorController extends DisposableController
     details?.setSubtreeRoot(subtreeRoot, subtreeSelection);
   }
 
-  InspectorInstanceRef? getSubtreeRootValue() {
-    return subtreeRoot?.valueRef;
-  }
-
   void setSubtreeRoot(
     RemoteDiagnosticsNode? node,
     RemoteDiagnosticsNode? selection,

@@ -181,8 +181,6 @@ class InspectorTreeController extends DisposableController
     });
   }
 
-  RemoteDiagnosticsNode? subtreeRoot; // Optional.
-
   InspectorTreeNode? get selection => _selection;
   InspectorTreeNode? _selection;
 

@@ -16,7 +16,6 @@ import 'package:path/path.dart' as path;
 import 'package:vm_service/vm_service.dart';
 
 import '../../service/vm_service_wrapper.dart';
-import '../../shared/console/eval/inspector_tree.dart';
 import '../../shared/diagnostics/diagnostics_node.dart';
 import '../../shared/diagnostics/inspector_service.dart';
 import '../../shared/globals.dart';
@@ -64,100 +63,6 @@ Future<String> _retrieveFullStringValue(
       Future.value(fallback);
 }
 
-class LoggingDetailsController {
-  LoggingDetailsController({
-    required this.onShowInspector,
-    required this.onShowDetails,
-    required this.createLoggingTree,
-  });
-
-  static const JsonEncoder jsonEncoder = JsonEncoder.withIndent('  ');
-
-  late LogData data;
-
-  /// Callback to execute to show the inspector.
-  final VoidCallback onShowInspector;
-
-  /// Callback to execute to show the data from the details tree in the view.
-  final OnShowDetails onShowDetails;
-
-  /// Callback to create an inspectorTree for the logging view of the correct
-  /// type.
-  final CreateLoggingTree createLoggingTree;
-
-  InspectorTreeController? tree;
-
-  void setData(LogData data) {
-    this.data = data;
-
-    tree = null;
-
-    if (data.node != null) {
-      tree = createLoggingTree(
-        onSelectionChange: () {
-          final InspectorTreeNode node = tree!.selection!;
-          unawaited(tree!.maybePopulateChildren(node));
-
-          // TODO(jacobr): node.diagnostic.isDiagnosticableValue isn't quite
-          // right.
-          final diagnosticLocal = node.diagnostic!;
-          if (diagnosticLocal.isDiagnosticableValue) {
-            // TODO(jacobr): warn if the selection can't be set as the node is
-            // stale which is likely if this is an old log entry.
-            onShowInspector();
-            unawaited(diagnosticLocal.setSelectionInspector(false));
-          }
-        },
-      );
-
-      final InspectorTreeNode root = tree!.setupInspectorTreeNode(
-        tree!.createNode(),
-        data.node!,
-        expandChildren: true,
-        expandProperties: true,
-      );
-      // No sense in collapsing the root node.
-      root.allowExpandCollapse = false;
-      tree!.root = root;
-      onShowDetails(tree: tree);
-
-      return;
-    }
-
-    // See if we need to asynchronously compute the log entry details.
-    if (data.needsComputing) {
-      onShowDetails(text: '');
-
-      unawaited(
-        data.compute().then((_) {
-          // If we're still displaying the same log entry, then update the UI with
-          // the calculated value.
-          if (this.data == data) {
-            _updateUIFromData();
-          }
-        }),
-      );
-    } else {
-      _updateUIFromData();
-    }
-  }
-
-  void _updateUIFromData() {
-    if (data.details?.startsWith('{') == true &&
-        data.details?.endsWith('}') == true) {
-      try {
-        // If the string decodes properly, then format the json.
-        final result = jsonDecode(data.details!);
-        onShowDetails(text: jsonEncoder.convert(result));
-      } catch (e) {
-        onShowDetails(text: data.details);
-      }
-    } else {
-      onShowDetails(text: data.details);
-    }
-  }
-}
-
 class LoggingController extends DisposableController
     with
         SearchControllerMixin<LogData>,
@@ -822,22 +727,6 @@ class LogData with SearchableDataMixin {
     }
   }
 
-  bool matchesFilter(String filter) {
-    if (kind.toLowerCase().contains(filter)) {
-      return true;
-    }
-
-    if (summary != null && summary!.toLowerCase().contains(filter)) {
-      return true;
-    }
-
-    if (_details != null && _details!.toLowerCase().contains(filter)) {
-      return true;
-    }
-
-    return false;
-  }
-
   @override
   bool matchesSearchToken(RegExp regExpSearch) {
     return (summary?.caseInsensitiveContains(regExpSearch) == true) ||
@@ -849,23 +738,19 @@ class LogData with SearchableDataMixin {
 }
 
 class FrameInfo {
-  FrameInfo(this.number, this.elapsedMs, this.startTimeMs);
+  FrameInfo(this.number, this.elapsedMs);
 
   static const String eventName = 'Flutter.Frame';
 
-  static const double kTargetMaxFrameTimeMs = 1000.0 / 60;
-
   static FrameInfo from(Map<String, dynamic> data) {
     return FrameInfo(
       data['number'],
       data['elapsed'] / 1000,
-      data['startTime'] / 1000,
     );
   }
 
   final int? number;
   final num? elapsedMs;
-  final num? startTimeMs;
 
   @override
   String toString() => 'frame $number ${elapsedMs!.toStringAsFixed(1)}ms';

@@ -112,19 +112,11 @@ class MemoryController extends DisposableController
 
   final _refreshCharts = ValueNotifier<int>(0);
 
-  void refreshAllCharts() {
-    _refreshCharts.value++;
-    _updateAndroidChartVisibility();
-  }
-
   /// Default is to display default tick width based on width of chart of the collected
   /// data in the chart.
   final _displayIntervalNotifier =
       ValueNotifier<ChartInterval>(ChartInterval.theDefault);
 
-  ValueListenable<ChartInterval> get displayIntervalNotifier =>
-      _displayIntervalNotifier;
-
   set displayInterval(ChartInterval interval) {
     _displayIntervalNotifier.value = interval;
   }

@@ -41,10 +41,6 @@ class DiffPaneController extends DisposableController {
   /// informational item.
   bool get hasSnapshots => core.snapshots.value.length > 1;
 
-  // This value should never be reset. It is incremented for every snapshot that
-  // is taken, and is used to assign a unique id to each [SnapshotListItem].
-  int _snapshotId = 0;
-
   Future<void> takeSnapshot() async {
     _isTakingSnapshot.value = true;
     ga.select(
@@ -53,7 +49,6 @@ class DiffPaneController extends DisposableController {
     );
 
     final item = SnapshotInstanceItem(
-      id: _snapshotId++,
       displayNumber: _nextDisplayNumber(),
       isolateName: selectedIsolateName ?? '<isolate-not-detected>',
     );

@@ -33,13 +33,10 @@ class SnapshotInstanceItem extends SnapshotItem {
   SnapshotInstanceItem({
     required this.displayNumber,
     required this.isolateName,
-    required this.id,
   }) {
     _isProcessing.value = true;
   }
 
-  final int id;
-
   final String isolateName;
 
   AdaptedHeap? heap;

@@ -80,7 +80,7 @@ class LeaksPaneController {
     List<LeakReport> reports,
   ) async {
     final graph = (await snapshotMemoryInSelectedIsolate())!;
-    return NotGCedAnalyzerTask.fromSnapshot(graph, reports, selectedIsolateId!);
+    return NotGCedAnalyzerTask.fromSnapshot(graph, reports);
   }
 
   Future<void> requestLeaksAndSaveToYaml() async {

@@ -34,10 +34,9 @@ class NotGCedAnalyzerTask {
   static Future<NotGCedAnalyzerTask> fromSnapshot(
     HeapSnapshotGraph graph,
     List<LeakReport> reports,
-    String isolateId,
   ) async {
     return NotGCedAnalyzerTask(
-      heap: await AdaptedHeapData.fromHeapSnapshot(graph, isolateId: isolateId),
+      heap: await AdaptedHeapData.fromHeapSnapshot(graph),
       reports: reports,
     );
   }

@@ -115,22 +115,18 @@ class SnapshotTaker {
     final snapshot = await snapshotMemoryInSelectedIsolate();
     _timeline?.addSnapshotEvent();
     if (snapshot == null) return null;
-    final result =
-        await _adaptSnapshotGaWrapper(snapshot, isolateId: selectedIsolateId!);
+    final result = await _adaptSnapshotGaWrapper(snapshot);
     return result;
   }
 }
 
-Future<AdaptedHeapData> _adaptSnapshotGaWrapper(
-  HeapSnapshotGraph graph, {
-  required String isolateId,
-}) async {
+Future<AdaptedHeapData> _adaptSnapshotGaWrapper(HeapSnapshotGraph graph) async {
   late final AdaptedHeapData result;
   await ga.timeAsync(
     gac.memory,
     gac.MemoryTime.adaptSnapshot,
-    asyncOperation: () async => result =
-        await AdaptedHeapData.fromHeapSnapshot(graph, isolateId: isolateId),
+    asyncOperation: () async =>
+        result = await AdaptedHeapData.fromHeapSnapshot(graph),
     screenMetricsProvider: () => MemoryScreenMetrics(
       heapObjectsTotal: graph.objects.length,
     ),
-Original file line number
+Diff line change
@@ Expand Up / @@ -181,8 +181,6 @@ class InspectorTreeController extends DisposableController @@
         });
       }
-      RemoteDiagnosticsNode? subtreeRoot; // Optional.
       InspectorTreeNode? get selection => _selection;
       InspectorTreeNode? _selection;
@@ Expand Down @@