Refactor InspectorServiceBase and ObjectGroupBase out of InspectorService and ObjectGroup (flutter#3465)

Author: matt-ragonese

packages/devtools_app/lib/src/console_service.dart

@@ -94,7 +94,7 @@ class ConsoleService extends Disposer {
   final _stdio = ListValueNotifier<ConsoleLine>([]);
   bool _stdioTrailingNewline = false;
 
-  ObjectGroup get objectGroup {
+  ObjectGroupBase get objectGroup {
     final inspectorService = serviceManager.inspectorService;
     if (_objectGroup?.inspectorService == inspectorService) {
       return _objectGroup;
@@ -104,7 +104,7 @@ class ConsoleService extends Disposer {
     return _objectGroup;
   }
 
-  ObjectGroup _objectGroup;
+  ObjectGroupBase _objectGroup;
 
   /// Clears the contents of stdio.
   void clearStdio() {

packages/devtools_app/lib/src/debugger/debugger_model.dart

@@ -406,7 +406,7 @@ Future<void> buildVariablesTree(
   }
   if (diagnostic != null && includeDiagnosticChildren) {
     // Always add children last after properties to avoid confusion.
-    final ObjectGroup service = diagnostic.inspectorService;
+    final ObjectGroupBase service = diagnostic.inspectorService;
     final diagnosticChildren = await diagnostic.children;
     if (diagnosticChildren?.isNotEmpty ?? false) {
       final childrenNode = Variable.text(
@@ -428,7 +428,7 @@ Future<void> buildVariablesTree(
   final inspectorService = serviceManager.inspectorService;
   if (inspectorService != null) {
     final tasks = <Future>[];
-    ObjectGroup group;
+    ObjectGroupBase group;
     Future<void> _maybeUpdateRef(Variable child) async {
       if (child.ref == null) return;
       if (child.ref.diagnostic == null) {
@@ -477,7 +477,7 @@ Future<void> buildVariablesTree(
 
 Future<Variable> _buildVariable(
   RemoteDiagnosticsNode diagnostic,
-  ObjectGroup inspectorService,
+  ObjectGroupBase inspectorService,
   IsolateRef isolateRef,
 ) async {
   final instanceRef =
@@ -491,7 +491,7 @@ Future<Variable> _buildVariable(
 }
 
 Future<List<Variable>> _createVariablesForDiagnostics(
-  ObjectGroup inspectorService,
+  ObjectGroupBase inspectorService,
   List<RemoteDiagnosticsNode> diagnostics,
   IsolateRef isolateRef,
 ) async {
@@ -798,16 +798,18 @@ class Variable extends TreeNode<Variable> {
     }
     // Group name doesn't matter in this case.
     final group = inspectorService.createObjectGroup('inspect-variables');
-
-    try {
-      return await group.setSelection(ref);
-    } catch (e) {
-      // This is somewhat unexpected. The inspectorRef must have been disposed.
-      return false;
-    } finally {
-      // Not really needed as we shouldn't actually be allocating anything.
-      unawaited(group.dispose());
+    if (group is ObjectGroup) {
+      try {
+        return await group.setSelection(ref);
+      } catch (e) {
+        // This is somewhat unexpected. The inspectorRef must have been disposed.
+        return false;
+      } finally {
+        // Not really needed as we shouldn't actually be allocating anything.
+        unawaited(group.dispose());
+      }
     }
+    return false;
   }
 
   Future<bool> get isInspectable async {

packages/devtools_app/lib/src/inspector/diagnostics_node.dart

@@ -92,7 +92,7 @@ class RemoteDiagnosticsNode extends DiagnosticableTree {
 
   /// Service used to retrieve more detailed information about the value of
   /// the property and its children and properties.
-  final ObjectGroup inspectorService;
+  final ObjectGroupBase inspectorService;
 
   /// JSON describing the diagnostic node.
   final Map<String, Object> json;
@@ -138,7 +138,7 @@ class RemoteDiagnosticsNode extends DiagnosticableTree {
 
   bool get isLocalClass {
     final objectGroup = inspectorService;
-    if (objectGroup is ObjectGroup) {
+    if (objectGroup is ObjectGroupBase) {
       return _isLocalClass ??= objectGroup.inspectorService.isLocalClass(this);
     } else {
       // TODO(jacobr): if objectGroup is a Future<ObjectGroup> we cannot compute
@@ -608,7 +608,7 @@ class RemoteDiagnosticsNode extends DiagnosticableTree {
   }
 
   Future<List<RemoteDiagnosticsNode>> getProperties(
-      ObjectGroup objectGroup) async {
+      ObjectGroupBase objectGroup) async {
     return await objectGroup.getProperties(dartDiagnosticRef);
   }
 
@@ -679,7 +679,10 @@ class RemoteDiagnosticsNode extends DiagnosticableTree {
   }
 
   Future<void> setSelectionInspector(bool uiAlreadyUpdated) async {
-    await inspectorService?.setSelectionInspector(valueRef, uiAlreadyUpdated);
+    final objectGroup = inspectorService;
+    if (objectGroup is ObjectGroup) {
+      await objectGroup.setSelectionInspector(valueRef, uiAlreadyUpdated);
+    }
   }
 }