Skip to content

Commit 4856206

Browse files
Add new inspectorServiceProvider() function to extensions_base.dart (flutter#3470)
1 parent d5619b9 commit 4856206

5 files changed

Lines changed: 13 additions & 5 deletions

File tree

packages/devtools_app/lib/devtools_app.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ export 'src/debugger/program_explorer_controller.dart';
1616
export 'src/debugger/span_parser.dart';
1717
export 'src/debugger/syntax_highlighter.dart';
1818
export 'src/error_badge_manager.dart';
19+
export 'src/extension_points/extensions_base.dart';
20+
export 'src/extension_points/extensions_external.dart';
1921
export 'src/globals.dart';
2022
export 'src/http/http_request_data.dart';
2123
export 'src/inspector/diagnostics.dart';

packages/devtools_app/lib/src/extension_points/extensions_base.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44

55
import '../common_widgets.dart';
66
import '../debugger/codeview.dart';
7+
import '../inspector/inspector_service.dart';
78

89
abstract class DevToolsExtensionPoints {
910
List<ScriptPopupMenuOption> buildExtraDebuggerScriptPopupMenuOptions();
1011

1112
Link issueTrackerLink();
1213

1314
String loadingAppSizeDataMessage();
15+
16+
InspectorServiceBase inspectorServiceProvider();
1417
}

packages/devtools_app/lib/src/extension_points/extensions_external.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
import '../common_widgets.dart';
66
import '../debugger/codeview.dart';
7+
import '../globals.dart';
8+
import '../inspector/inspector_service.dart';
79
import 'extensions_base.dart';
810

911
class ExternalDevToolsExtensionPoints implements DevToolsExtensionPoints {
@@ -21,4 +23,8 @@ class ExternalDevToolsExtensionPoints implements DevToolsExtensionPoints {
2123
String loadingAppSizeDataMessage() {
2224
return 'Loading app size data. Please wait...';
2325
}
26+
27+
@override
28+
InspectorServiceBase inspectorServiceProvider() =>
29+
serviceManager.connectedApp.isFlutterAppNow ? InspectorService() : null;
2430
}

packages/devtools_app/lib/src/service_manager.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,7 @@ class ServiceConnectionManager {
302302
return;
303303
}
304304

305-
if (connectedApp.isFlutterAppNow) {
306-
_inspectorService = InspectorService();
307-
} else {
308-
_inspectorService = null;
309-
}
305+
_inspectorService = devToolsExtensionPoints.inspectorServiceProvider();
310306

311307
// Set up analytics dimensions for the connected app.
312308
await ga.setupUserApplicationDimensions();

packages/devtools_test/lib/flutter_test_environment.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ class FlutterTestEnvironment {
9797
await preferencesController.init();
9898
setGlobal(ServiceConnectionManager, ServiceConnectionManager());
9999
setGlobal(PreferencesController, preferencesController);
100+
setGlobal(DevToolsExtensionPoints, ExternalDevToolsExtensionPoints());
100101
await serviceManager.vmServiceOpened(
101102
_service,
102103
onClosed: Completer().future,

0 commit comments

Comments
 (0)