Skip to content

Commit

Permalink
review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
kenzieschmoll committed Jul 17, 2023
1 parent 3c61d45 commit 7136c05
Show file tree
Hide file tree
Showing 67 changed files with 91 additions and 92 deletions.
4 changes: 2 additions & 2 deletions packages/devtools_app/lib/devtools_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
// found in the LICENSE file.

export 'src/app.dart';
export 'src/extensions/static/extension_points_base.dart';
export 'src/extensions/static/extension_points_external.dart';
export 'src/framework/app_bar.dart';
export 'src/framework/home_screen.dart';
export 'src/framework/notifications_view.dart';
Expand Down Expand Up @@ -77,6 +75,8 @@ export 'src/shared/console/primitives/simple_items.dart';
export 'src/shared/console/widgets/description.dart';
export 'src/shared/diagnostics/diagnostics_node.dart';
export 'src/shared/diagnostics/inspector_service.dart';
export 'src/shared/environment_parameters/environment_parameters_base.dart';
export 'src/shared/environment_parameters/environment_parameters_external.dart';
export 'src/shared/error_badge_manager.dart';
export 'src/shared/globals.dart';
export 'src/shared/http/http_request_data.dart';
Expand Down
6 changes: 3 additions & 3 deletions packages/devtools_app/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import 'package:flutter/foundation.dart';

import 'initialization.dart';
import 'src/extensions/static/extension_points_base.dart';
import 'src/extensions/static/extension_points_external.dart';
import 'src/shared/environment_parameters/environment_parameters_base.dart';
import 'src/shared/environment_parameters/environment_parameters_external.dart';
import 'src/shared/globals.dart';
import 'src/shared/primitives/utils.dart';

Expand All @@ -26,7 +26,7 @@ void externalRunDevTools({
List<DevToolsJsonFile> sampleData = const [],
}) {
// Set the extension points global.
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());

runDevTools(
integrationTestMode: integrationTestMode,
Expand Down
6 changes: 6 additions & 0 deletions packages/devtools_app/lib/src/extensions/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## What are DevTools extensions?

DevTools extensions are custom tooling screens provided by pub packages that
can be loaded into DevTools at runtime.

This feature is under construction - more documenation to come.
6 changes: 0 additions & 6 deletions packages/devtools_app/lib/src/extensions/runtime/README.md

This file was deleted.

5 changes: 0 additions & 5 deletions packages/devtools_app/lib/src/extensions/static/README.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// found in the LICENSE file.

import '../../screens/debugger/codeview.dart';
import '../../shared/common_widgets.dart';
import '../../shared/diagnostics/inspector_service.dart';
import '../common_widgets.dart';
import '../diagnostics/inspector_service.dart';

abstract class DevToolsExtensionPoints {
abstract class DevToolsEnvironmentParameters {
List<ScriptPopupMenuOption> buildExtraDebuggerScriptPopupMenuOptions();

Link issueTrackerLink({String? additionalInfo, String? issueTitle});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
import 'package:flutter/foundation.dart';

import '../../screens/debugger/codeview.dart';
import '../../shared/analytics/constants.dart' as gac;
import '../../shared/common_widgets.dart';
import '../../shared/diagnostics/inspector_service.dart';
import '../../shared/globals.dart';
import '../../shared/utils.dart';
import 'extension_points_base.dart';

class ExternalDevToolsExtensionPoints implements DevToolsExtensionPoints {
import '../analytics/constants.dart' as gac;
import '../common_widgets.dart';
import '../diagnostics/inspector_service.dart';
import '../globals.dart';
import '../utils.dart';
import 'environment_parameters_base.dart';

class ExternalDevToolsEnvironmentParameters
implements DevToolsEnvironmentParameters {
@override
List<ScriptPopupMenuOption> buildExtraDebuggerScriptPopupMenuOptions() =>
<ScriptPopupMenuOption>[];
Expand Down
6 changes: 3 additions & 3 deletions packages/devtools_app/lib/src/shared/globals.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import '../extensions/static/extension_points_base.dart';
import '../screens/debugger/breakpoint_manager.dart';
import '../service/service_manager.dart';
import '../shared/banner_messages.dart';
import '../shared/notifications.dart';
import 'config_specific/ide_theme/ide_theme.dart';
import 'console/eval/eval_service.dart';
import 'environment_parameters/environment_parameters_base.dart';
import 'framework_controller.dart';
import 'offline_mode.dart';
import 'preferences.dart';
Expand Down Expand Up @@ -41,8 +41,8 @@ SurveyService get surveyService => globals[SurveyService] as SurveyService;
PreferencesController get preferences =>
globals[PreferencesController] as PreferencesController;

DevToolsExtensionPoints get devToolsExtensionPoints =>
globals[DevToolsExtensionPoints] as DevToolsExtensionPoints;
DevToolsEnvironmentParameters get devToolsExtensionPoints =>
globals[DevToolsEnvironmentParameters] as DevToolsEnvironmentParameters;

OfflineModeController get offlineController =>
globals[OfflineModeController] as OfflineModeController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import '../test_infra/test_data/app_size/unsupported_file.dart';
void main() {
setUp(() {
setGlobal(ServiceConnectionManager, FakeServiceManager());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
setGlobal(IdeTheme, IdeTheme());
setGlobal(NotificationService, NotificationService());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void main() {

setUp(() {
setGlobal(ServiceConnectionManager, FakeServiceManager());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
setGlobal(IdeTheme, IdeTheme());
callGraph = generateCallGraphWithDominators(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void main() {
}

setUp(() {
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(ServiceConnectionManager, fakeServiceManager);
setGlobal(OfflineModeController, OfflineModeController());
setGlobal(PreferencesController, PreferencesController());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void main() {
processId: 'test',
);

setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(OfflineModeController, OfflineModeController());
setGlobal(NotificationService, NotificationService());
setGlobal(BannerMessagesController, BannerMessagesController());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ void main() {
when(fakeServiceManager.connectedApp!.isFlutterAppNow).thenReturn(false);

setUp(() {
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(ServiceConnectionManager, fakeServiceManager);
setGlobal(OfflineModeController, OfflineModeController());
setGlobal(PreferencesController, PreferencesController());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void main() {
setGlobal(IdeTheme, IdeTheme());
setGlobal(ScriptManager, MockScriptManager());
setGlobal(NotificationService, NotificationService());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
scriptsHistory.pushEntry(mockScript!);
final mockCodeViewController = debuggerController.codeViewController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void main() {
setGlobal(IdeTheme, IdeTheme());
setGlobal(ScriptManager, MockScriptManager());
setGlobal(NotificationService, NotificationService());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void main() {
setGlobal(ScriptManager, MockScriptManager());
setGlobal(NotificationService, NotificationService());
setGlobal(EvalService, MockEvalService());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void main() {
late EvalOnDartLibrary eval;

setUp(() async {
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(BreakpointManager, BreakpointManager());
setGlobal(EvalService, EvalService());
setGlobal(NotificationService, NotificationService());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void main() {
setGlobal(ScriptManager, scriptManager);
setGlobal(NotificationService, NotificationService());
setGlobal(BreakpointManager, mockBreakpointManager);
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void main() {
setGlobal(NotificationService, NotificationService());
setGlobal(BreakpointManager, BreakpointManager());
setGlobal(ScriptManager, scriptManager);
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void main() {
setGlobal(ScriptManager, scriptManager);
setGlobal(NotificationService, NotificationService());
setGlobal(BreakpointManager, BreakpointManager());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void main() {
setGlobal(NotificationService, NotificationService());
setGlobal(ScriptManager, scriptManager);
setGlobal(BreakpointManager, BreakpointManager());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void main() {
setGlobal(ScriptManager, scriptManager);
setGlobal(NotificationService, NotificationService());
setGlobal(BreakpointManager, BreakpointManager());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void main() {
setGlobal(NotificationService, NotificationService());
setGlobal(BreakpointManager, BreakpointManager());
setGlobal(EvalService, MockEvalService());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void main() {
setGlobal(ScriptManager, scriptManager);
setGlobal(NotificationService, NotificationService());
setGlobal(BreakpointManager, BreakpointManager());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
fakeServiceManager.consoleService.ensureServiceInitialized();
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('debugger'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void main() {
setGlobal(IdeTheme, IdeTheme());
setGlobal(ScriptManager, MockScriptManager());
setGlobal(NotificationService, NotificationService());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());

mockConnectedApp(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void main() {
createMockProgramExplorerControllerWithDefaults();
setGlobal(IdeTheme, IdeTheme());
setGlobal(ServiceConnectionManager, fakeServiceManager);
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'package:devtools_app/src/extensions/static/extension_points_external.dart';
import 'package:devtools_app/src/shared/environment_parameters/environment_parameters_external.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/test/inspector/diagnostics_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void main() {
''',
);
setUp(() {
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
setGlobal(IdeTheme, IdeTheme());
setGlobal(ServiceConnectionManager, FakeServiceManager());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void main() async {
}
};

setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(BreakpointManager, BreakpointManager());
setGlobal(IdeTheme, IdeTheme());
setGlobal(NotificationService, NotificationService());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void main() {
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('inspector'))
.thenReturn(ValueNotifier<int>(0));

setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(ServiceConnectionManager, fakeServiceManager);
setGlobal(IdeTheme, IdeTheme());
setGlobal(PreferencesController, PreferencesController());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void main() {
when(app.isFlutterAppNow).thenReturn(true);
when(app.isProfileBuildNow).thenReturn(false);

setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(ServiceConnectionManager, fakeServiceManager);
setGlobal(IdeTheme, IdeTheme());
setGlobal(PreferencesController, PreferencesController());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void main() {
.thenReturn(ValueNotifier<int>(0));
setGlobal(ServiceConnectionManager, fakeServiceManager);
setGlobal(NotificationService, NotificationService());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
setGlobal(IdeTheme, IdeTheme());
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void main() {
when(fakeServiceManager.errorBadgeManager.errorCountNotifier('logging'))
.thenReturn(ValueNotifier<int>(0));
setGlobal(NotificationService, NotificationService());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
setGlobal(ServiceConnectionManager, fakeServiceManager);
setGlobal(IdeTheme, IdeTheme());
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/test/memory/memory_screen_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void main() {
.thenReturn(false);
when(fakeServiceManager.connectedApp!.isDartWebApp)
.thenAnswer((_) => Future.value(false));
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(ServiceConnectionManager, fakeServiceManager);
setGlobal(PreferencesController, PreferencesController());
setGlobal(OfflineModeController, OfflineModeController());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void main() {
socketProfile = loadSocketProfile();
httpProfile = loadHttpProfile();
setGlobal(IdeTheme, IdeTheme());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
setGlobal(NotificationService, NotificationService());
setGlobal(BreakpointManager, BreakpointManager());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void main() {

setUp(() {
setGlobal(IdeTheme, IdeTheme());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());
clipboardContents = '';
fakeServiceManager = FakeServiceManager(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ void main() {
const windowSize = Size(3000.0, 1000.0);

setUp(() {
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(IdeTheme, IdeTheme());
setGlobal(PreferencesController, PreferencesController());
setGlobal(OfflineModeController, OfflineModeController());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void main() {
setGlobal(IdeTheme, IdeTheme());
setGlobal(NotificationService, NotificationService());
setGlobal(BannerMessagesController, BannerMessagesController());
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
setGlobal(DevToolsEnvironmentParameters, ExternalDevToolsEnvironmentParameters());
setGlobal(PreferencesController, PreferencesController());

framesController = FlutterFramesController(
Expand Down
Loading

0 comments on commit 7136c05

Please sign in to comment.