Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue where first build of the VM Tools status bar would cause a null pointer exception #2905

Merged
merged 3 commits into from
Apr 15, 2021
Merged

Fix issue where first build of the VM Tools status bar would cause a null pointer exception #2905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4507c4
Fix issue where first build of the VM Tools status bar would cause a …
bkonyi Apr 15, 2021
efde127
Update status_line.dart
bkonyi Apr 15, 2021
38542d7
Add assertion
bkonyi Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 69 additions & 45 deletions packages/devtools_app/lib/src/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class DevToolsAppState extends State<DevToolsApp> {
Widget _providedControllers({@required Widget child, bool offline = false}) {
final _providers = widget.screens
.where((s) =>
s.createController != null && (offline ? s.supportsOffline : true))
s.providesController && (offline ? s.supportsOffline : true))
.map((s) => s.controllerProvider)
.toList();

Expand Down Expand Up @@ -303,9 +303,10 @@ class DevToolsAppState extends State<DevToolsApp> {
class DevToolsScreen<C> {
const DevToolsScreen(
this.screen, {
@required this.createController,
this.createController,
this.controller,
this.supportsOffline = false,
});
}) : assert(createController == null || controller == null);

final Screen screen;

Expand All @@ -315,17 +316,35 @@ class DevToolsScreen<C> {
/// widgets depending on this controller can access it by calling
/// `Provider<C>.of(context)`.
///
/// If null, [screen] will be responsible for creating and maintaining its own
/// controller.
/// If [createController] and [controller] are both null, [screen] will be
/// responsible for creating and maintaining its own controller.
final C Function() createController;

/// A provided controller for this screen, if non-null.
///
/// The controller will then be provided via [controllerProvider], and
/// widgets depending on this controller can access it by calling
/// `Provider<C>.of(context)`.
///
/// If [createController] and [controller] are both null, [screen] will be
/// responsible for creating and maintaining its own controller.
final C controller;

/// Returns true if a controller was provided for [screen]. If false,
/// [screen] is responsible for creating and maintaining its own controller.
bool get providesController => createController != null || controller != null;

/// Whether this screen has implemented offline support.
///
/// Defaults to false.
final bool supportsOffline;

Provider<C> get controllerProvider {
assert(createController != null);
assert((createController != null && controller == null) ||
(createController == null && controller != null));
bkonyi marked this conversation as resolved.
Show resolved Hide resolved
if (controller != null) {
return Provider<C>.value(value: controller);
}
return Provider<C>(create: (_) => createController());
}
}
Expand Down Expand Up @@ -526,49 +545,54 @@ class SettingsDialog extends StatelessWidget {
///
/// Conditional screens can be added to this list, and they will automatically
/// be shown or hidden based on the [Screen.conditionalLibrary] provided.
List<DevToolsScreen> get defaultScreens => <DevToolsScreen>[
DevToolsScreen<InspectorSettingsController>(
const InspectorScreen(),
createController: () => InspectorSettingsController(),
),
DevToolsScreen<PerformanceController>(
const PerformanceScreen(),
createController: () => PerformanceController(),
supportsOffline: true,
),
DevToolsScreen<ProfilerScreenController>(
const ProfilerScreen(),
createController: () => ProfilerScreenController(),
supportsOffline: true,
),
DevToolsScreen<MemoryController>(
const MemoryScreen(),
createController: () => MemoryController(),
),
DevToolsScreen<DebuggerController>(
const DebuggerScreen(),
createController: () => DebuggerController(),
),
DevToolsScreen<NetworkController>(
const NetworkScreen(),
createController: () => NetworkController(),
),
DevToolsScreen<LoggingController>(
const LoggingScreen(),
createController: () => LoggingController(),
),
DevToolsScreen<AppSizeController>(
const AppSizeScreen(),
createController: () => AppSizeController(),
),
DevToolsScreen<VMDeveloperToolsController>(
const VMDeveloperToolsScreen(),
createController: () => VMDeveloperToolsController(),
List<DevToolsScreen> get defaultScreens {
final vmDeveloperToolsController = VMDeveloperToolsController();
return <DevToolsScreen>[
DevToolsScreen<InspectorSettingsController>(
const InspectorScreen(),
createController: () => InspectorSettingsController(),
),
DevToolsScreen<PerformanceController>(
const PerformanceScreen(),
createController: () => PerformanceController(),
supportsOffline: true,
),
DevToolsScreen<ProfilerScreenController>(
const ProfilerScreen(),
createController: () => ProfilerScreenController(),
supportsOffline: true,
),
DevToolsScreen<MemoryController>(
const MemoryScreen(),
createController: () => MemoryController(),
),
DevToolsScreen<DebuggerController>(
const DebuggerScreen(),
createController: () => DebuggerController(),
),
DevToolsScreen<NetworkController>(
const NetworkScreen(),
createController: () => NetworkController(),
),
DevToolsScreen<LoggingController>(
const LoggingScreen(),
createController: () => LoggingController(),
),
DevToolsScreen<AppSizeController>(
const AppSizeScreen(),
createController: () => AppSizeController(),
),
DevToolsScreen<VMDeveloperToolsController>(
VMDeveloperToolsScreen(
controller: vmDeveloperToolsController
),
controller: vmDeveloperToolsController,
),
// Uncomment to see a sample implementation of a conditional screen.
// DevToolsScreen<ExampleController>(
// const ExampleConditionalScreen(),
// createController: () => ExampleController(),
// supportsOffline: true,
// ),
];
];
}
14 changes: 8 additions & 6 deletions packages/devtools_app/lib/src/vm_developer/vm_developer_tools_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ abstract class VMDeveloperView {
}

class VMDeveloperToolsScreen extends Screen {
const VMDeveloperToolsScreen()
: super.conditional(
const VMDeveloperToolsScreen({
@required this.controller,
}) : super.conditional(
id: id,
title: 'VM Tools',
icon: Icons.settings_applications,
Expand All @@ -48,9 +49,11 @@ class VMDeveloperToolsScreen extends Screen {

static const id = 'vm-tools';

final VMDeveloperToolsController controller;

@override
ValueListenable<bool> get showIsolateSelector =>
_VMDeveloperToolsScreenState.controller.showIsolateSelector;
controller.showIsolateSelector;

@override
Widget build(BuildContext context) => const VMDeveloperToolsScreenBody();
Expand All @@ -70,9 +73,8 @@ class VMDeveloperToolsScreenBody extends StatefulWidget {

class _VMDeveloperToolsScreenState extends State<VMDeveloperToolsScreenBody>
with AutoDisposeMixin {
// TODO(bkonyi): do we want this to be static? Currently necessary to provide
// access to the `showIsolateSelector` via `VMDeveloperToolsScreen`
static VMDeveloperToolsController controller;

VMDeveloperToolsController controller;

@override
void didChangeDependencies() {
Expand Down