simplify the debugger's libraries view (#2386)

simplify the debugger's libraries view
flutter · Sep 29, 2020 · f38f4ac · f38f4ac
1 parent 6dce387
commit f38f4ac
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/packages/devtools_app/lib/src/debugger/debugger_model.dart b/packages/devtools_app/lib/src/debugger/debugger_model.dart
@@ -285,6 +285,7 @@ class FileNode extends TreeNode<FileNode> {
       for (var name in directoryParts) {
         node = node._getCreateChild(name);
       }
+
       node.scriptRef = script;
     }
 
@@ -311,6 +312,21 @@ class FileNode extends TreeNode<FileNode> {
       child._trimChildrenAsMapEntries();
     }
   }
+
+  @override
+  int get hashCode => scriptRef?.hashCode ?? name.hashCode;
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! FileNode) return false;
+    final FileNode node = other;
+
+    if (scriptRef == null) {
+      return node.scriptRef != null ? false : name == node.name;
+    } else {
+      return node.scriptRef == null ? false : scriptRef == node.scriptRef;
+    }
+  }
 }
 
 class ScriptRefUtils {
@@ -347,6 +363,13 @@ class ScriptRefUtils {
       ];
     }
 
-    return parts;
+    if (parts.length > 1) {
+      return [
+        parts.first,
+        parts.sublist(1).join('/'),
+      ];
+    } else {
+      return parts;
+    }
   }
 }
diff --git a/packages/devtools_app/lib/src/debugger/scripts.dart b/packages/devtools_app/lib/src/debugger/scripts.dart
@@ -130,7 +130,6 @@ class ScriptPickerState extends State<ScriptPicker> {
       waitDuration: tooltipWait,
       preferBelow: false,
       message: node.name,
-      key: ValueKey(node.name),
       child: Material(
         child: InkWell(
           onTap: () {

diff --git a/packages/devtools_app/test/debugger_model_test.dart b/packages/devtools_app/test/debugger_model_test.dart
@@ -65,15 +65,7 @@ void main() {
         expect(child.scriptRef, isNull);
 
         child = child.children[0];
-        expect(child.name, 'bar');
-        expect(child.scriptRef, isNull);
-
-        child = child.children[0];
-        expect(child.name, 'baz');
-        expect(child.scriptRef, isNull);
-
-        child = child.children[0];
-        expect(child.name, 'qux.dart');
+        expect(child.name, 'bar/baz/qux.dart');
         expect(child.scriptRef, isNotNull);
       });
 
@@ -89,11 +81,7 @@ void main() {
         expect(child.scriptRef, isNull);
 
         child = child.children[0];
-        expect(child.name, 'bar');
-        expect(child.scriptRef, isNull);
-
-        child = child.children[0];
-        expect(child.name, 'baz.dart');
+        expect(child.name, 'bar/baz.dart');
         expect(child.scriptRef, isNotNull);
       });
     });
@@ -111,12 +99,12 @@ void main() {
         expect(
           ScriptRefUtils.splitDirectoryParts(
               ScriptRef(uri: 'package:foo.bar.baz/qux.dart', id: 'id-5')),
-          orderedEquals(['package:foo', 'bar', 'baz', 'qux.dart']),
+          orderedEquals(['package:foo', 'bar/baz/qux.dart']),
         );
         expect(
           ScriptRefUtils.splitDirectoryParts(
               ScriptRef(uri: 'google3:///foo/bar/baz.dart', id: 'id-6')),
-          orderedEquals(['google3:foo', 'bar', 'baz.dart']),
+          orderedEquals(['google3:foo', 'bar/baz.dart']),
         );
       });
     });