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

Jump to bottom

Widget inspector should operate on main isolate, not selected isolate #6434

Merged
merged 9 commits into from Sep 25, 2023
Merged

Widget inspector should operate on main isolate, not selected isolate #6434

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7b60c8a
change to using main isolate in inspector
CoderDake Sep 20, 2023
4bc73c6
release notes
CoderDake Sep 20, 2023
43ca634
widget inspector should only use the main isolate
CoderDake Sep 20, 2023
0fb9bc2
use isolate param
CoderDake Sep 21, 2023
6adc209
Merge remote-tracking branch 'upstream/master' into inspector-isolate…
CoderDake Sep 22, 2023
8fdc10c
Pass the eval isolate in from higher up
CoderDake Sep 25, 2023
a5d7f7f
pass isolate the proper way :face_palm:
CoderDake Sep 25, 2023
22a450b
extra line
CoderDake Sep 25, 2023
9fe55f7
super clean
CoderDake Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 11 additions & 8 deletions packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart
View file
Open in desktop
Expand Up @@ -35,14 +35,16 @@ abstract class InspectorServiceBase extends DisposableController
required this.clientInspectorName,
required this.serviceExtensionPrefix,
required String inspectorLibraryUri,
ValueListenable<IsolateRef?>? evalIsolate,
}) : assert(serviceConnection.serviceManager.connectedAppInitialized),
assert(serviceConnection.serviceManager.service != null),
clients = {},
inspectorLibrary = EvalOnDartLibrary(
inspectorLibraryUri,
serviceConnection.serviceManager.service!,
serviceManager: serviceConnection.serviceManager,
) {
clients = {} {
inspectorLibrary = EvalOnDartLibrary(
inspectorLibraryUri,
serviceConnection.serviceManager.service!,
serviceManager: serviceConnection.serviceManager,
isolate: evalIsolate,
);
CoderDake marked this conversation as resolved.
Show resolved Hide resolved
_lastMainIsolate =
serviceConnection.serviceManager.isolateManager.mainIsolate.value;
addAutoDisposeListener(
Expand Down Expand Up @@ -71,7 +73,7 @@ abstract class InspectorServiceBase extends DisposableController
final String serviceExtensionPrefix;

final Set<InspectorServiceClient> clients;
final EvalOnDartLibrary inspectorLibrary;
late final EvalOnDartLibrary inspectorLibrary;
IsolateRef? _lastMainIsolate;

/// Reference to the isolate running the inspector that [InspectorServiceBase]
Expand Down Expand Up @@ -189,11 +191,12 @@ abstract class InspectorServiceBase extends DisposableController
/// Manages communication between inspector code running in the Flutter app and
/// the inspector.
class InspectorService extends InspectorServiceBase {
InspectorService()
InspectorService({ValueListenable<IsolateRef?>? evalIsolate})
CoderDake marked this conversation as resolved.
Show resolved Hide resolved
: super(
clientInspectorName: 'WidgetInspectorService',
serviceExtensionPrefix: inspectorExtensionPrefix,
inspectorLibraryUri: inspectorLibraryUri,
evalIsolate: evalIsolate,
CoderDake marked this conversation as resolved.
Show resolved Hide resolved
) {
// Note: We do not need to listen to event history here because the
// inspector uses a separate API to get the current inspector selection.
Expand Down
5 changes: 4 additions & 1 deletion ...s/devtools_app/lib/src/shared/environment_parameters/environment_parameters_external.dart
View file
Open in desktop
Expand Up @@ -52,7 +52,10 @@ class ExternalDevToolsEnvironmentParameters
@override
InspectorServiceBase? inspectorServiceProvider() =>
serviceConnection.serviceManager.connectedApp!.isFlutterAppNow == true
? InspectorService()
? InspectorService(
evalIsolate:
serviceConnection.serviceManager.isolateManager.mainIsolate,
)
: null;

@override
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ DevTools extension for your pub package, see the getting started guide for

## Inspector updates

TODO: Remove this section if there are not any general updates.
* Fixed bug where inspector service calls were done on the selected isolate, instead of the main isolate - [#6434](https://github.com/flutter/devtools/pull/6434)

## Performance updates

Expand Down