Do not show native JavaScript fields, include dart:ui library (#1367)

* Do not show native js fields, include dart:ui library

Fix bugs discovered in manual testing debugging on flutter apps:

Closes: #1366
Closes: #1365

* Make test validate all fields of Type object

* Addressed CR comments

Author: Anna Gringauze

dwds/lib/src/debugging/debugger.dart

@@ -325,18 +325,10 @@ class Debugger extends Domain {
     // JavaScript objects
     return boundVariables
         .where((bv) =>
-            bv != null &&
-            !_isNativeJsObject(bv.value as vm_service.InstanceRef))
+            bv != null && !isNativeJsObject(bv.value as vm_service.InstanceRef))
         .toList();
   }
 
-  bool _isNativeJsObject(vm_service.InstanceRef instanceRef) =>
-      // New type representation of JS objects reifies them to JavaScriptObject.
-      (instanceRef?.classRef?.name == 'JavaScriptObject' &&
-          instanceRef?.classRef?.library?.uri == 'dart:_interceptors') ||
-      // Old type representation still needed to support older SDK versions.
-      instanceRef?.classRef?.name == 'NativeJavaScriptObject';
-
   Future<BoundVariable> _boundVariable(Property property) async {
     // We return one level of properties from this object. Sub-properties are
     // another round trip.
@@ -511,7 +503,7 @@ class Debugger extends Domain {
 
           // TODO: The exception object generally doesn't get converted to a
           // Dart object (and instead has a classRef name of 'NativeJavaScriptObject').
-          if (_isNativeJsObject(exception)) {
+          if (isNativeJsObject(exception)) {
             if (obj.description != null) {
               // Create a string exception object.
               exception = await inspector.instanceHelper
@@ -639,6 +631,13 @@ class Debugger extends Domain {
   }
 }
 
+bool isNativeJsObject(vm_service.InstanceRef instanceRef) =>
+    // New type representation of JS objects reifies them to JavaScriptObject.
+    (instanceRef?.classRef?.name == 'JavaScriptObject' &&
+        instanceRef?.classRef?.library?.uri == 'dart:_interceptors') ||
+    // Old type representation still needed to support older SDK versions.
+    instanceRef?.classRef?.name == 'NativeJavaScriptObject';
+
 /// Returns the Dart line number for the provided breakpoint.
 int _lineNumberFor(Breakpoint breakpoint) =>
     int.parse(breakpoint.id.split('#').last);

dwds/lib/src/debugging/instance.dart

@@ -15,6 +15,7 @@ import '../utilities/domain.dart';
 import '../utilities/objects.dart';
 import '../utilities/shared.dart';
 import 'classes.dart';
+import 'debugger.dart';
 import 'inspector.dart';
 import 'metadata/class.dart';
 import 'metadata/function.dart';
@@ -169,16 +170,18 @@ class InstanceHelper extends Domain {
   Future<Instance> _plainInstanceFor(ClassRef classRef,
       RemoteObject remoteObject, List<Property> properties) async {
     var dartProperties = await _dartFieldsFor(properties, remoteObject);
-    var fields = await Future.wait(
+    var boundFields = await Future.wait(
         dartProperties.map<Future<BoundField>>((p) => _fieldFor(p, classRef)));
-    fields = fields.toList()
+    boundFields = boundFields
+        .where((bv) => bv != null && !isNativeJsObject(bv.value as InstanceRef))
+        .toList()
       ..sort((a, b) => a.decl.name.compareTo(b.decl.name));
     var result = Instance(
         kind: InstanceKind.kPlainInstance,
         id: remoteObject.objectId,
         identityHashCode: remoteObject.objectId.hashCode,
         classRef: classRef)
-      ..fields = fields;
+      ..fields = boundFields;
     return result;
   }
 

dwds/lib/src/debugging/metadata/provider.dart

@@ -65,7 +65,8 @@ class MetadataProvider {
         'dart:svg',
         'dart:web_audio',
         'dart:web_gl',
-        'dart:web_sql'
+        'dart:web_sql',
+        'dart:ui',
       ];
 
   MetadataProvider(this.entrypoint, this._assetReader)

dwds/test/build_daemon_evaluate_test.dart

@@ -164,6 +164,49 @@ void main() async {
             });
           });
 
+          test('Type does not show native JavaScript object fields', () async {
+            await onBreakPoint(isolate.id, mainScript, 'printLocal', () async {
+              Future<Instance> getInstance(InstanceRef ref) async {
+                var result = await setup.service.getObject(isolate.id, ref.id);
+                expect(result, isA<Instance>());
+                return result as Instance;
+              }
+
+              var event = await stream.firstWhere(
+                  (event) => event.kind == EventKind.kPauseBreakpoint);
+
+              var result = await setup.service
+                  .evaluateInFrame(isolate.id, event.topFrame.index, 'Type');
+              expect(result, isA<InstanceRef>());
+              var instanceRef = result as InstanceRef;
+
+              // Type
+              var instance = await getInstance(instanceRef);
+              for (var field in instance.fields) {
+                var name = field.decl.name;
+
+                // Type.<name> (i.e. Type._type)
+                instance = await getInstance(field.value as InstanceRef);
+                for (var field in instance.fields) {
+                  var nestedName = field.decl.name;
+
+                  // Type.<name>.<nestedName> (i.e Type._type._subtypeCache)
+                  instance = await getInstance(field.value as InstanceRef);
+
+                  expect(
+                      instance,
+                      isA<Instance>().having(
+                          (instance) => instance.classRef.name,
+                          'Type.$name.$nestedName: classRef.name',
+                          isNot(isIn([
+                            'NativeJavaScriptObject',
+                            'JavaScriptObject',
+                          ]))));
+                }
+              }
+            });
+          });
+
           test('field', () async {
             await onBreakPoint(
                 isolate.id, mainScript, 'printFieldFromLibraryClass', () async {