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

feat: migrate base/dds.dart to null-safety (#88015)

Browse Source
This commit is contained in:
嘟囔 2021-08-12 05:47:06 +08:00 committed by GitHub
parent 4ef8088ce8
commit d2f9c6c752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/flutter_tools/lib/src/base/dds.dart
View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
import 'dart:async';
import 'package:dds/dds.dart' as dds;
@ -24,10 +22,10 @@ Future<dds.DartDevelopmentService> Function(
/// Helper class to launch a [dds.DartDevelopmentService]. Allows for us to
/// mock out this functionality for testing purposes.
class DartDevelopmentService {
dds.DartDevelopmentService _ddsInstance;
dds.DartDevelopmentService? _ddsInstance;
Uri get uri => _ddsInstance?.uri ?? _existingDdsUri;
Uri _existingDdsUri;
Uri? get uri => _ddsInstance?.uri ?? _existingDdsUri;
Uri? _existingDdsUri;
Future<void> get done => _completer.future;
final Completer<void> _completer = Completer<void>();
@ -37,7 +35,7 @@ class DartDevelopmentService {
int hostPort,
bool ipv6,
bool disableServiceAuthCodes, {
@required Logger logger,
required Logger logger,
}) async {
final Uri ddsUri = Uri(
scheme: 'http',
@ -45,7 +43,7 @@ class DartDevelopmentService {
io.InternetAddress.loopbackIPv6 :
io.InternetAddress.loopbackIPv4
).host,
port: hostPort ?? 0,
port: hostPort,
);
logger.printTrace(
'Launching a Dart Developer Service (DDS) instance at $ddsUri, '
@ -58,12 +56,12 @@ class DartDevelopmentService {
enableAuthCodes: !disableServiceAuthCodes,
ipv6: ipv6,
);
unawaited(_ddsInstance.done.whenComplete(() {
unawaited(_ddsInstance?.done.whenComplete(() {
if (!_completer.isCompleted) {
_completer.complete();
}
}));
logger.printTrace('DDS is listening at ${_ddsInstance.uri}.');
logger.printTrace('DDS is listening at ${_ddsInstance?.uri}.');
} on dds.DartDevelopmentServiceException catch (e) {
logger.printTrace('Warning: Failed to start DDS: ${e.message}');
if (e.errorCode == dds.DartDevelopmentServiceException.existingDdsInstanceError) {