Add tab for inspecting the state of package:provider

analysis_options.yaml

@@ -12,6 +12,7 @@ analyzer:
     missing_return: warning
   exclude:
     - build/**
+    - '**.freezed.dart'
 
 linter:
   rules:

packages/devtools_app/lib/main.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'src/analytics/stub_provider.dart'
     if (dart.library.html) 'src/analytics/remote_provider.dart';
@@ -11,6 +12,7 @@ import 'src/config_specific/framework_initialize/framework_initialize.dart';
 import 'src/config_specific/ide_theme/ide_theme.dart';
 import 'src/debugger/syntax_highlighter.dart';
 import 'src/preferences.dart';
+import 'src/provider/riverpod_error_logger_observer.dart';
 
 void main() async {
   final ideTheme = getIdeTheme();
@@ -29,6 +31,9 @@ void main() async {
 
   // Now run the app.
   runApp(
-    DevToolsApp(defaultScreens, ideTheme, await analyticsProvider),
+    ProviderScope(
+      observers: const [ErrorLoggerObserver()],
+      child: DevToolsApp(defaultScreens, ideTheme, await analyticsProvider),
+    ),
   );
 }

packages/devtools_app/lib/src/app.dart

@@ -37,6 +37,7 @@ import 'performance/performance_controller.dart';
 import 'performance/performance_screen.dart';
 import 'profiler/profiler_screen.dart';
 import 'profiler/profiler_screen_controller.dart';
+import 'provider/provider_screen.dart';
 import 'routing.dart';
 import 'scaffold.dart';
 import 'screen.dart';
@@ -565,6 +566,10 @@ List<DevToolsScreen> get defaultScreens => <DevToolsScreen>[
         const VMDeveloperToolsScreen(),
         createController: () => VMDeveloperToolsController(),
       ),
+      DevToolsScreen<void>(
+        const ProviderScreen(),
+        createController: () {},
+      ),
 // Uncomment to see a sample implementation of a conditional screen.
 //      DevToolsScreen<ExampleController>(
 //        const ExampleConditionalScreen(),

packages/devtools_app/lib/src/banner_messages.dart

@@ -254,6 +254,28 @@ Relaunch your application with the '--profile' argument, or ''',
   }
 }
 
+class ProviderUnknownErrorBanner {
+  const ProviderUnknownErrorBanner({@required this.screenId});
+
+  final String screenId;
+
+  BannerMessage build(BuildContext context) {
+    return _BannerError(
+      key: Key('ProviderUnknownErrorBanner - $screenId'),
+      screenId: screenId,
+      textSpans: const [
+        TextSpan(
+          text: '''
+The devtool failed to connect with package:provider.
+
+This could be caused by an outdated version of package:provider. Make sure that you are using a version >=5.0.0.''',
+          style: TextStyle(color: _BannerError.foreground),
+        ),
+      ],
+    );
+  }
+}
+
 class HighProfileGranularityMessage {
   HighProfileGranularityMessage(this.screenId)
       : key = Key('HighProfileGranularityMessage - $screenId');

packages/devtools_app/lib/src/config_specific/logger/logger_default.dart

@@ -4,7 +4,7 @@
 
 import 'logger.dart';
 
-void log(String message, [LogLevel level = LogLevel.debug]) {
+void log(Object message, [LogLevel level = LogLevel.debug]) {
   switch (level) {
     case LogLevel.debug:
       print(message);

packages/devtools_app/lib/src/config_specific/logger/logger_html.dart

@@ -6,7 +6,7 @@ import 'dart:html';
 
 import 'logger.dart';
 
-void log(String message, [LogLevel level = LogLevel.debug]) {
+void log(Object message, [LogLevel level = LogLevel.debug]) {
   switch (level) {
     case LogLevel.debug:
       window.console.log(message);

packages/devtools_app/lib/src/config_specific/logger/logger_io.dart

@@ -4,7 +4,7 @@
 
 import 'logger.dart';
 
-void log(String message, [LogLevel level = LogLevel.debug]) {
+void log(Object message, [LogLevel level = LogLevel.debug]) {
   switch (level) {
     case LogLevel.debug:
       print(message);

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

@@ -811,7 +811,9 @@ class DebuggerController extends DisposableController
     }
 
     final variables = frame.vars.map((v) => Variable.create(v)).toList();
-    variables.forEach(buildVariablesTree);
+    variables
+      ..forEach(buildVariablesTree)
+      ..sort((a, b) => sortFieldsByName(a.boundVar.name, b.boundVar.name));
     return variables;
   }
 

packages/devtools_app/lib/src/eval_on_dart_library.dart

@@ -84,6 +84,7 @@ class EvalOnDartLibrary {
 
   Completer<LibraryRef> _libraryRef;
   Future<LibraryRef> get libraryRef => _libraryRef.future;
+
   Completer allPendingRequestsDone;
 
   Isolate get isolate => _isolate;
@@ -203,6 +204,9 @@ class EvalOnDartLibrary {
     InstanceRef instance, {
     @required Disposable isAlive,
   }) async {
+    // identityHashCode will be -1 if the Flutter SDK is not recent enough
+    if (instance.identityHashCode != -1) return instance.identityHashCode;
+
     final hash = await evalInstance(
       'instance.hashCode',
       isAlive: isAlive,
@@ -298,7 +302,8 @@ class EvalOnDartLibrary {
       '() async {'
       '  final reader = widgetInspectorService.toObject("$readerId", "$readerGroup") as List;'
       '  try {'
-      '    final result = $expression;'
+      // Cast as dynamic so that it is possible to await Future<void>
+      '    dynamic result = ($expression) as dynamic;'
       '    reader.add(result);'
       '  } catch (err, stack) {'
       '    reader.add(err);'

packages/devtools_app/lib/src/provider/instance_viewer/eval.dart

@@ -0,0 +1,41 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// A few utilities related to evaluating dart code
+library eval;
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../eval_on_dart_library.dart';
+import '../../globals.dart';
+
+/// An [EvalOnDartLibrary] that has access to no specific library in particular
+///
+/// Not suitable to be used when evaluating third-party objects, as it would
+/// otherwise not be possible to read private properties.
+final evalProvider = Provider<EvalOnDartLibrary>((ref) {
+  final eval = EvalOnDartLibrary(['dart:io'], serviceManager.service);
+  ref.onDispose(eval.dispose);
+  return eval;
+});
+
+/// An [EvalOnDartLibrary] that has access to `provider`
+final providerEvalProvider = Provider<EvalOnDartLibrary>((ref) {
+  final eval = EvalOnDartLibrary(
+    ['package:provider/src/provider.dart'],
+    serviceManager.service,
+  );
+
+  ref.onDispose(eval.dispose);
+  return eval;
+});
+
+/// An [EvalOnDartLibrary] for custom objects.
+final libraryEvalProvider =
+    AutoDisposeProviderFamily<EvalOnDartLibrary, String>((ref, libraryPath) {
+  final eval = EvalOnDartLibrary([libraryPath], serviceManager.service);
+
+  ref.onDispose(eval.dispose);
+  return eval;
+});

packages/devtools_app/lib/src/provider/instance_viewer/fake_freezed_annotation.dart

@@ -0,0 +1,29 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file contains annotations that behaves like package:freezed_annotation.
+// This allows using Freezed without having the devtool depend on the package.
+// We could instead remove the annotations, but that would make the process of
+// updating the generated files tedious.
+
+export 'package:meta/meta.dart';
+export 'package:collection/collection.dart';
+
+const nullable = Object();
+const freezed = Object();
+
+class Default {
+  const Default(Object value);
+}
+
+class Assert {
+  const Assert(String exp);
+}
+
+class JsonKey {
+  const JsonKey({
+    bool ignore,
+    Object defaultValue,
+  });
+}