Don't show hovercards for primitive and null values (#8528)

flutter · Nov 26, 2024 · 0d0b96c · 0d0b96c
1 parent fae2844
commit 0d0b96c
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 2 deletions.
diff --git a/packages/devtools_app/lib/src/screens/debugger/codeview.dart b/packages/devtools_app/lib/src/screens/debugger/codeview.dart
@@ -1172,7 +1172,7 @@ class _LineItemState extends State<LineItem>
 
     final word = wordForHover(event.localPosition.dx, widget.lineContents);
 
-    if (word != '') {
+    if (word != '' && !isPrimitiveValueOrNull(word)) {
       try {
         final response = await evalService.evalAtCurrentFrame(word);
         final isolateRef =

diff --git a/packages/devtools_app/lib/src/shared/console/widgets/description.dart b/packages/devtools_app/lib/src/shared/console/widgets/description.dart
@@ -207,7 +207,8 @@ class DiagnosticsNodeDescription extends StatelessWidget {
       enabled:
           () =>
               preferences.inspector.hoverEvalModeEnabled.value &&
-              diagnosticLocal.objectGroupApi != null,
+              diagnosticLocal.objectGroupApi != null &&
+              !isPrimitiveValueOrNull(description),
       asyncGenerateHoverCardData: ({
         required event,
         required isHoverStale,

diff --git a/packages/devtools_app/lib/src/shared/ui/hover.dart b/packages/devtools_app/lib/src/shared/ui/hover.dart
@@ -66,6 +66,25 @@ String wordForHover(double dx, TextSpan line) {
   return word;
 }
 
+bool isPrimitiveValueOrNull(String valueAsString) {
+  if (valueAsString.isEmpty) return false;
+  final isNull = valueAsString == 'null';
+  final isBool = valueAsString == 'true' || valueAsString == 'false';
+  final isInt = int.tryParse(valueAsString) != null;
+  final isDouble = double.tryParse(valueAsString) != null;
+
+  bool isString = false;
+  if (valueAsString.length > 2) {
+    final firstChar = valueAsString[0];
+    final lastChar = valueAsString[valueAsString.length - 1];
+    isString =
+        [firstChar, lastChar].every((char) => char == '"') ||
+        [firstChar, lastChar].every((char) => char == "'");
+  }
+
+  return isNull || isBool || isInt || isDouble || isString;
+}
+
 /// Returns the index in the Textspan's plainText for which the hover offset is
 /// located.
 int _hoverIndexFor(double dx, TextSpan line) {

diff --git a/packages/devtools_app/test/shared/hover_test.dart b/packages/devtools_app/test/shared/hover_test.dart
@@ -41,4 +41,38 @@ void main() {
     expect(wordForHover(250, _textSpan), 'foo.bar');
     expect(wordForHover(300, _textSpan), 'foo.bar.baz');
   });
+
+  group('isPrimitiveValueOrNull', () {
+    test('returns false for non-primitives values', () {
+      expect(isPrimitiveValueOrNull('myVariable'), isFalse);
+      expect(isPrimitiveValueOrNull('MyWidget'), isFalse);
+      expect(isPrimitiveValueOrNull('MyClass'), isFalse);
+    });
+
+    test('returns true for null', () {
+      expect(isPrimitiveValueOrNull('null'), isTrue);
+    });
+
+    test('returns true for ints', () {
+      expect(isPrimitiveValueOrNull('10'), isTrue);
+      expect(isPrimitiveValueOrNull('3'), isTrue);
+      expect(isPrimitiveValueOrNull('255'), isTrue);
+    });
+
+    test('returns true for doubles', () {
+      expect(isPrimitiveValueOrNull('.3'), isTrue);
+      expect(isPrimitiveValueOrNull('1.7'), isTrue);
+      expect(isPrimitiveValueOrNull('123.389'), isTrue);
+    });
+
+    test('returns true for bools', () {
+      expect(isPrimitiveValueOrNull('true'), isTrue);
+      expect(isPrimitiveValueOrNull('false'), isTrue);
+    });
+
+    test('returns true for strings', () {
+      expect(isPrimitiveValueOrNull('"Hello World!"'), isTrue);
+      expect(isPrimitiveValueOrNull("'Hello World!'"), isTrue);
+    });
+  });
 }