github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix issue where DevTools would not be immediately available when using --start-paused" (#128117)

Browse Source 
Reverts flutter/flutter#126698

There are a bunch of tool crashes on CI that start with this commit. I'm
not sure this PR is the cause because there is no backtrace from the
tool on the crashes. The only error message is `Oops; flutter has exited
unexpectedly: "Null check operator used on a null value`.
This commit is contained in:
Zachary Anderson 2023-06-02 07:31:07 -07:00 committed by GitHub
parent 60a87d0798
commit fdb71de7a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/flutter_tools/lib/src/resident_devtools_handler.dart
View File

@ -35,7 +35,6 @@ abstract class ResidentDevtoolsHandler {
Future<void> serveAndAnnounceDevTools({
Uri? devToolsServerAddress,
required List<FlutterDevice?> flutterDevices,
bool isStartPaused = false,
});
bool launchDevToolsInBrowser({required List<FlutterDevice?> flutterDevices});
@ -72,7 +71,6 @@ class FlutterResidentDevtoolsHandler implements ResidentDevtoolsHandler {
Future<void> serveAndAnnounceDevTools({
Uri? devToolsServerAddress,
required List<FlutterDevice?> flutterDevices,
bool isStartPaused = false,
}) async {
assert(!_readyToAnnounce);
if (!_residentRunner.supportsServiceProtocol || _devToolsLauncher == null) {
@ -90,14 +88,20 @@ class FlutterResidentDevtoolsHandler implements ResidentDevtoolsHandler {
assert(!_readyToAnnounce);
return;
}
final List<FlutterDevice?> devicesWithExtension = await _devicesWithExtensions(flutterDevices);
await _maybeCallDevToolsUriServiceExtension(devicesWithExtension);
await _callConnectedVmServiceUriExtension(devicesWithExtension);
if (_shutdown) {
// If we're shutting down, no point reporting the debugger list.
return;
}
_readyToAnnounce = true;
assert(_devToolsLauncher!.activeDevToolsServer != null);
final Uri? devToolsUrl = _devToolsLauncher!.devToolsUrl;
if (devToolsUrl != null) {
for (final FlutterDevice? device in flutterDevices) {
for (final FlutterDevice? device in devicesWithExtension) {
if (device == null) {
continue;
}
@ -107,35 +111,11 @@ class FlutterResidentDevtoolsHandler implements ResidentDevtoolsHandler {
}
}
Future<void> callServiceExtensions() async {
final List<FlutterDevice?> devicesWithExtension = await _devicesWithExtensions(flutterDevices);
await Future.wait(
<Future<void>>[
_maybeCallDevToolsUriServiceExtension(devicesWithExtension),
_callConnectedVmServiceUriExtension(devicesWithExtension)
]
);
}
// If the application is starting paused, we can't invoke service extensions
// as they're handled on the target app's paused isolate. Since invoking
// service extensions will block in this situation, we should wait to invoke
// them until after we've output the DevTools connection details.
if (!isStartPaused) {
await callServiceExtensions();
}
_readyToAnnounce = true;
assert(_devToolsLauncher!.activeDevToolsServer != null);
if (_residentRunner.reportedDebuggers) {
// Since the DevTools only just became available, we haven't had a chance to
// report their URLs yet. Do so now.
_residentRunner.printDebuggerList(includeVmService: false);
}
if (isStartPaused) {
await callServiceExtensions();
}
}
// This must be guaranteed not to return a Future that fails.
@ -315,11 +295,7 @@ class NoOpDevtoolsHandler implements ResidentDevtoolsHandler {
}
@override
Future<void> serveAndAnnounceDevTools({
Uri? devToolsServerAddress,
List<FlutterDevice?>? flutterDevices,
bool isStartPaused = false,
}) async {
Future<void> serveAndAnnounceDevTools({Uri? devToolsServerAddress, List<FlutterDevice?>? flutterDevices}) async {
return;
}

2
packages/flutter_tools/lib/src/run_cold.dart
View File

@ -86,7 +86,6 @@ class ColdRunner extends ResidentRunner {
unawaited(residentDevtoolsHandler!.serveAndAnnounceDevTools(
devToolsServerAddress: debuggingOptions.devToolsServerAddress,
flutterDevices: flutterDevices,
isStartPaused: debuggingOptions.startPaused,
));
}
if (debuggingOptions.serveObservatory) {
@ -174,7 +173,6 @@ class ColdRunner extends ResidentRunner {
unawaited(residentDevtoolsHandler!.serveAndAnnounceDevTools(
devToolsServerAddress: debuggingOptions.devToolsServerAddress,
flutterDevices: flutterDevices,
isStartPaused: debuggingOptions.startPaused,
));
}
if (debuggingOptions.serveObservatory) {

1
packages/flutter_tools/lib/src/run_hot.dart
View File

@ -246,7 +246,6 @@ class HotRunner extends ResidentRunner {
unawaited(residentDevtoolsHandler!.serveAndAnnounceDevTools(
devToolsServerAddress: debuggingOptions.devToolsServerAddress,
flutterDevices: flutterDevices,
isStartPaused: debuggingOptions.startPaused,
));
}

4
packages/flutter_tools/test/general.shard/resident_devtools_handler_test.dart
View File

@ -156,7 +156,6 @@ void main() {
},
),
listViews,
listViews,
const FakeVmServiceRequest(
method: 'ext.flutter.activeDevToolsServerAddress',
args: <String, Object>{
@ -164,6 +163,7 @@ void main() {
'value': 'http://localhost:8080',
},
),
listViews,
const FakeVmServiceRequest(
method: 'ext.flutter.connectedVmServiceUri',
args: <String, Object>{
@ -314,7 +314,6 @@ void main() {
},
),
listViews,
listViews,
const FakeVmServiceRequest(
method: 'ext.flutter.activeDevToolsServerAddress',
args: <String, Object>{
@ -322,6 +321,7 @@ void main() {
'value': 'http://localhost:8080',
},
),
listViews,
const FakeVmServiceRequest(
method: 'ext.flutter.connectedVmServiceUri',
args: <String, Object>{

53
packages/flutter_tools/test/integration.shard/devtools_uri_test.dart
View File

@ -1,53 +0,0 @@
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:async';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/convert.dart';
import '../src/common.dart';
import 'test_data/basic_project.dart';
import 'test_utils.dart';
void main() {
late Directory tempDir;
final BasicProject project = BasicProject();
setUp(() async {
tempDir = createResolvedTempDirectorySync('run_test.');
await project.setUpIn(tempDir);
});
tearDown(() async {
tryToDelete(tempDir);
});
// Regression test for https://github.com/flutter/flutter/issues/126691
testWithoutContext('flutter run --start-paused prints DevTools URI', () async {
final Completer<void> completer = Completer<void>();
final RegExp matcher = RegExp(r'The Flutter DevTools debugger and profiler on');
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final Process process = await processManager.start(<String>[
flutterBin,
'run',
'--start-paused',
'-d',
'flutter-tester',
], workingDirectory: tempDir.path);
late StreamSubscription<String> sub;
sub = process.stdout.transform(utf8.decoder).listen((String message) {
if (message.contains(matcher)) {
completer.complete();
sub.cancel();
}
});
await completer.future;
process.kill();
await process.exitCode;
});
}