Add color coding for class types.

packages/devtools_app/NEXT_RELEASE_NOTES.md

@@ -24,8 +24,9 @@ TODO: Remove this section if there are not any general updates.
 
 ## Memory updates
 
-* Improve usability of snapshot diffing - [#5015](https://github.com/flutter/devtools/pull/5015)
+* Improve usability of snapshot diffing [#5015](https://github.com/flutter/devtools/pull/5015)
 * UI polish and cleanup - [#4855](https://github.com/flutter/devtools/pull/4855)
+* Color code classes [#5030](https://github.com/flutter/devtools/pull/5030)
 
 ## Debugger updates
 

packages/devtools_app/lib/src/screens/memory/panes/allocation_profile/allocation_profile_table_view.dart

@@ -17,6 +17,7 @@ import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../shared/primitives/simple_elements.dart';
 
+import '../../shared/shared_memory_widgets.dart';
 import 'allocation_profile_table_view_controller.dart';
 import 'model.dart';
 
@@ -27,7 +28,8 @@ import 'model.dart';
 /// instances, memory).
 const _defaultNumberFieldWidth = 90.0;
 
-class _FieldClassNameColumn extends ColumnData<AllocationProfileRecord> {
+class _FieldClassNameColumn extends ColumnData<AllocationProfileRecord>
+    implements ColumnRenderer<AllocationProfileRecord> {
   _FieldClassNameColumn()
       : super(
           'Class',
@@ -38,12 +40,32 @@ class _FieldClassNameColumn extends ColumnData<AllocationProfileRecord> {
   String? getValue(AllocationProfileRecord dataObject) =>
       dataObject.heapClass.className;
 
+  // We are removing the tooltip, because it is provided by [HeapClassView].
   @override
-  String getTooltip(AllocationProfileRecord dataObject) =>
-      dataObject.heapClass.fullName;
+  String getTooltip(AllocationProfileRecord dataObject) => '';
 
   @override
   bool get supportsSorting => true;
+
+  @override
+  Widget? build(
+    BuildContext context,
+    AllocationProfileRecord data, {
+    bool isRowSelected = false,
+    VoidCallback? onPressed,
+  }) {
+    if (data.isTotal) return null;
+
+    final theme = Theme.of(context);
+    return HeapClassView(
+      theClass: data.heapClass,
+      showCopyButton: isRowSelected,
+      copyGaItem: gac.MemoryEvent.diffClassSingleCopy,
+      textStyle:
+          isRowSelected ? theme.selectedTextStyle : theme.regularTextStyle,
+      rootPackage: serviceManager.rootInfoNow().package,
+    );
+  }
 }
 
 /// For more information on the Dart GC implementation, see:

packages/devtools_app/lib/src/screens/memory/panes/allocation_tracing/allocation_profile_class_table.dart

@@ -7,12 +7,14 @@ import 'package:flutter/material.dart';
 import '../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/common_widgets.dart';
+import '../../../../shared/globals.dart';
 import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/table/table.dart';
 import '../../../../shared/table/table_controller.dart';
 import '../../../../shared/table/table_data.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
+import '../../shared/shared_memory_widgets.dart';
 import 'allocation_profile_tracing_view_controller.dart';
 
 /// The default width for columns containing *mostly* numeric data (e.g.,
@@ -65,14 +67,37 @@ class _TraceCheckBoxColumn extends ColumnData<TracedClass>
   }
 }
 
-class _ClassNameColumn extends ColumnData<TracedClass> {
+class _ClassNameColumn extends ColumnData<TracedClass>
+    implements ColumnRenderer<TracedClass> {
   _ClassNameColumn() : super.wide('Class');
 
   @override
   String? getValue(TracedClass stats) => stats.cls.name;
 
+  // We are removing the tooltip, because it is provided by [HeapClassView].
+  @override
+  String getTooltip(TracedClass dataObject) => '';
+
   @override
   bool get supportsSorting => true;
+
+  @override
+  Widget build(
+    BuildContext context,
+    TracedClass data, {
+    bool isRowSelected = false,
+    VoidCallback? onPressed,
+  }) {
+    final theme = Theme.of(context);
+    return HeapClassView(
+      theClass: data.name,
+      showCopyButton: isRowSelected,
+      copyGaItem: gac.MemoryEvent.diffClassSingleCopy,
+      textStyle:
+          isRowSelected ? theme.selectedTextStyle : theme.regularTextStyle,
+      rootPackage: serviceManager.rootInfoNow().package,
+    );
+  }
 }
 
 class _InstancesColumn extends ColumnData<TracedClass> {

packages/devtools_app/lib/src/screens/memory/panes/allocation_tracing/allocation_profile_tracing_view_controller.dart

@@ -12,6 +12,7 @@ import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/table/table_data.dart';
 import '../../../profiler/cpu_profile_model.dart';
 import '../../../profiler/cpu_profile_transformer.dart';
+import '../../shared/primitives/class_name.dart';
 
 // TODO(bkonyi): make compatible with ClassHeapDetailStats for serialization /
 // deserialization support.
@@ -20,13 +21,14 @@ class TracedClass with PinnableListEntry {
   TracedClass({
     required this.cls,
   })  : traceAllocations = false,
-        instances = 0;
+        instances = 0,
+        name = HeapClassName.fromClassRef(cls);
 
   TracedClass._({
     required this.cls,
     required this.instances,
     required this.traceAllocations,
-  });
+  }) : name = HeapClassName.fromClassRef(cls);
 
   TracedClass copyWith({
     ClassRef? cls,
@@ -40,6 +42,7 @@ class TracedClass with PinnableListEntry {
     );
   }
 
+  final HeapClassName name;
   final ClassRef cls;
   final int instances;
   final bool traceAllocations;

packages/devtools_app/lib/src/screens/memory/panes/diff/controller/diff_pane_controller.dart

@@ -11,6 +11,7 @@ import 'package:flutter/foundation.dart';
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/config_specific/import_export/import_export.dart';
+import '../../../../../shared/globals.dart';
 import '../../../../../shared/primitives/auto_dispose.dart';
 import '../../../../../shared/primitives/utils.dart';
 import '../../../shared/heap/class_filter.dart';
@@ -149,6 +150,8 @@ class DiffPaneController extends DisposableController {
 /// Widgets should not update the fields directly, they should use
 /// [DiffPaneController] or [DerivedData] for this.
 class CoreData {
+  late final rootPackage = serviceManager.rootInfoNow().package;
+
   /// The list contains one item that show information and all others
   /// are snapshots.
   ValueListenable<List<SnapshotItem>> get snapshots => _snapshots;
@@ -283,14 +286,14 @@ class DerivedData extends DisposableController with AutoDisposeControllerMixin {
   }) {
     final filter = _core.classFilter.value;
     if (classes is SingleHeapClasses) {
-      _singleClassesToShow.value = classes.filtered(filter);
+      _singleClassesToShow.value = classes.filtered(filter, _core.rootPackage);
       _diffClassesToShow.value = null;
       selectedSingleClassStats.value =
           _filter(classes.classesByName[className]);
       selectedDiffClassStats.value = null;
     } else if (classes is DiffHeapClasses) {
       _singleClassesToShow.value = null;
-      _diffClassesToShow.value = classes.filtered(filter);
+      _diffClassesToShow.value = classes.filtered(filter, _core.rootPackage);
       selectedSingleClassStats.value = null;
       selectedDiffClassStats.value = _filter(classes.classesByName[className]);
     } else if (classes == null) {
@@ -306,7 +309,12 @@ class DerivedData extends DisposableController with AutoDisposeControllerMixin {
   /// Returns [classStats] if it matches the current filter.
   T? _filter<T extends ClassStats>(T? classStats) {
     if (classStats == null) return null;
-    if (_core.classFilter.value.apply(classStats.heapClass)) return classStats;
+    if (_core.classFilter.value.apply(
+      classStats.heapClass,
+      _core.rootPackage,
+    )) {
+      return classStats;
+    }
     return null;
   }
 
@@ -394,10 +402,16 @@ class DerivedData extends DisposableController with AutoDisposeControllerMixin {
     // Get class with max retained size.
     final ClassStats theClass;
     if (classes is SingleHeapClasses) {
-      final classStatsList = classes.filtered(_core.classFilter.value);
+      final classStatsList = classes.filtered(
+        _core.classFilter.value,
+        _core.rootPackage,
+      );
       theClass = classStatsList.reduce(singleWithMaxRetainedSize);
     } else if (classes is DiffHeapClasses) {
-      final classStatsList = classes.filtered(_core.classFilter.value);
+      final classStatsList = classes.filtered(
+        _core.classFilter.value,
+        _core.rootPackage,
+      );
       theClass = classStatsList.reduce(diffWithMaxRetainedSize);
     } else {
       throw StateError('Unexpected type ${classes.runtimeType}');

packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/class_filter.dart

@@ -14,6 +14,7 @@ import '../../../../../shared/dialogs.dart';
 import '../../../../../shared/theme.dart';
 import '../../../../../shared/utils.dart';
 import '../../../shared/heap/class_filter.dart';
+import '../../../shared/primitives/class_name.dart';
 
 String _adaptRootPackageForFilter(String? rootPackage) {
   if (rootPackage == null || rootPackage.isEmpty) return '';
@@ -130,7 +131,7 @@ class _ClassFilterDialogState extends State<ClassFilterDialog> {
 
     return StateUpdateDialog(
       title: 'Filter Classes and Packages',
-      helpText: _helpText,
+      helpBuilder: _helpBuilder,
       onResetDefaults: () {
         ga.select(
           gac.memory,
@@ -167,11 +168,38 @@ class _ClassFilterDialogState extends State<ClassFilterDialog> {
   }
 }
 
+Widget _helpBuilder(BuildContext context) {
+  final textStyle = DialogHelpText.textStyle(context);
+  return Column(
+    crossAxisAlignment: CrossAxisAlignment.start,
+    children: [
+      Text(_helpText, style: textStyle),
+      ...ClassType.values.map(
+        (t) => Column(
+          children: [
+            Row(
+              children: [
+                t.icon,
+                Text(
+                  ' ${t.alias} - for ${t.aliasDescription}',
+                  style: textStyle,
+                ),
+                CopyToClipboardControl(
+                  dataProvider: () => t.alias,
+                  size: tableIconSize,
+                )
+              ],
+            ),
+          ],
+        ),
+      ),
+    ],
+  );
+}
+
 const _helpText = 'Choose and customize the filter.\n'
     'List full or partial class names separated by new lines. For example:\n\n'
     '  package:myPackage/src/myFolder/myLibrary.dart/MyClass\n'
     '  MyClass\n'
     '  package:myPackage/src/\n\n'
-    'Specify:\n'
-    '  - ${ClassFilter.dartInternalAlias} for dart internal objects, not assigned to any package\n'
-    '  - ${ClassFilter.dartAndFlutterLibrariesAlias} for most "dart:" and "package:" libraries published by Dart and Flutter orgs.';
+    'Use aliases to filter classes by type:\n';

packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_diff.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;
+import '../../../../../shared/globals.dart';
 import '../../../../../shared/primitives/utils.dart';
 import '../../../../../shared/table/table.dart';
 import '../../../../../shared/table/table_data.dart';
@@ -34,7 +35,7 @@ class _ClassNameColumn extends ColumnData<DiffClassStats>
       : super(
           'Class',
           titleTooltip: 'Class name',
-          fixedWidthPx: scaleByFontFactor(180.0),
+          fixedWidthPx: scaleByFontFactor(200.0),
           alignment: ColumnAlignment.left,
         );
 
@@ -64,6 +65,7 @@ class _ClassNameColumn extends ColumnData<DiffClassStats>
       copyGaItem: gac.MemoryEvent.diffClassDiffCopy,
       textStyle:
           isRowSelected ? theme.selectedTextStyle : theme.regularTextStyle,
+      rootPackage: serviceManager.rootInfoNow().package,
     );
   }
 

packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/classes_table_single.dart

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/feature_flags.dart';
+import '../../../../../shared/globals.dart';
 import '../../../../../shared/primitives/utils.dart';
 import '../../../../../shared/table/table.dart';
 import '../../../../../shared/table/table_data.dart';
@@ -26,7 +27,7 @@ class _ClassNameColumn extends ColumnData<SingleClassStats>
       : super(
           'Class',
           titleTooltip: 'Class name',
-          fixedWidthPx: scaleByFontFactor(180.0),
+          fixedWidthPx: scaleByFontFactor(200.0),
           alignment: ColumnAlignment.left,
         );
 
@@ -57,6 +58,7 @@ class _ClassNameColumn extends ColumnData<SingleClassStats>
       copyGaItem: gac.MemoryEvent.diffClassSingleCopy,
       textStyle:
           isRowSelected ? theme.selectedTextStyle : theme.regularTextStyle,
+      rootPackage: serviceManager.rootInfoNow().package,
     );
   }
 

packages/devtools_app/lib/src/screens/memory/shared/heap/class_filter.dart

@@ -36,16 +36,13 @@ class ClassFilter {
   ClassFilter.empty()
       : this(
           filterType: ClassFilterType.showAll,
-          except: '$dartInternalAlias\n$dartAndFlutterLibrariesAlias',
+          except: '${ClassType.runtime.alias}\n${ClassType.sdk.alias}',
           only: null,
         );
 
   static String _trimByLine(String value) =>
       value.split('\n').map((e) => e.trim()).join('\n');
 
-  static const String dartAndFlutterLibrariesAlias = '\$dart-flutter-libraries';
-  static const String dartInternalAlias = '\$dart-internal-objects';
-
   final ClassFilterType filterType;
   final String except;
 
@@ -124,25 +121,24 @@ class ClassFilter {
     }
   }
 
-  bool apply(HeapClassName className) {
+  bool apply(HeapClassName className, String? rootPackage) {
     if (className.isRoot) return false;
 
     if (filterType == ClassFilterType.showAll) return true;
 
     for (var filter in filters) {
-      if (_isMatch(className, filter)) {
+      if (_isMatch(className, filter, rootPackage)) {
         return filterType == ClassFilterType.only;
       }
     }
 
     return filterType == ClassFilterType.except;
   }
 
-  bool _isMatch(HeapClassName className, String filter) {
+  bool _isMatch(HeapClassName className, String filter, String? rootPackage) {
     if (className.fullName.contains(filter)) return true;
-    if (filter == dartAndFlutterLibrariesAlias && className.isDartOrFlutter)
-      return true;
-    if (filter == dartInternalAlias && className.isPackageless) return true;
-    return false;
+
+    final classType = className.classType(rootPackage);
+    return filter == classType.alias;
   }
 }

packages/devtools_app/lib/src/screens/memory/shared/heap/heap.dart

@@ -45,7 +45,7 @@ mixin FilterableHeapClasses<T extends ClassStats> on HeapClasses<T> {
   ClassFilter? _appliedFilter;
   List<T>? _filtered;
 
-  List<T> filtered(ClassFilter newFilter) {
+  List<T> filtered(ClassFilter newFilter, String? rootPackage) {
     final oldFilter = _appliedFilter;
     final oldFiltered = _filtered;
     _appliedFilter = newFilter;
@@ -69,8 +69,9 @@ mixin FilterableHeapClasses<T extends ClassStats> on HeapClasses<T> {
       throw StateError('Unexpected task: $task.');
     }
 
-    final result =
-        dataToFilter.where((e) => newFilter.apply(e.heapClass)).toList();
+    final result = dataToFilter
+        .where((e) => newFilter.apply(e.heapClass, rootPackage))
+        .toList();
     return _filtered = result;
   }
 }