languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 14:49:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Observatory strong mode fix: fix type errors with onDisconnect.

Browse source 
The method ObservatoryApplication._switchVM calls newVM.onDisconnect
and requires the resulting future to be completed with a String.  In
normal operation, this is satisfied and we just need to change a few
static types to enforce it.  But when FakeVM was in use, the future
was completed with `this`.  Since ObservatoryApplication._switchVM is
the only call site that cares what the future is completed with, it
makes sense to just change all the types to Future<String> and modify
FakeVM accordingly.

Change-Id: Id94d27ac6a42f31ab19ccc9ad8dd270ecf4042b4
Reviewed-on: https://dart-review.googlesource.com/57400
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
This commit is contained in:
Paul Berry 2018-05-30 20:50:24 +00:00 committed by commit-bot@chromium.org
parent 3027302af6
commit 9e3842d624
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime/observatory/lib/service_common.dart
View file

@ -77,7 +77,7 @@ abstract class CommonWebSocket {
/// The Dart VM can be embedded in Chromium or standalone. /// The Dart VM can be embedded in Chromium or standalone.
abstract class CommonWebSocketVM extends VM { abstract class CommonWebSocketVM extends VM {
final Completer _connected = new Completer(); final Completer _connected = new Completer();
final Completer _disconnected = new Completer<String>(); final Completer<String> _disconnected = new Completer<String>();
final WebSocketVMTarget target; final WebSocketVMTarget target;
final Map<String, _WebSocketRequest> _delayedRequests = final Map<String, _WebSocketRequest> _delayedRequests =
new Map<String, _WebSocketRequest>(); new Map<String, _WebSocketRequest>();
@ -114,7 +114,7 @@ abstract class CommonWebSocketVM extends VM {
} }
} }
Future get onDisconnect => _disconnected.future; Future<String> get onDisconnect => _disconnected.future;
bool get isDisconnected => _disconnected.isCompleted; bool get isDisconnected => _disconnected.isCompleted;
void disconnect({String reason: 'WebSocket closed'}) { void disconnect({String reason: 'WebSocket closed'}) {

8
runtime/observatory/lib/src/service/object.dart
View file

@ -963,7 +963,7 @@ abstract class VM extends ServiceObjectOwner implements M.VM {
Future get onConnect; Future get onConnect;
/// Completes when the VM disconnects or there was an error connecting. /// Completes when the VM disconnects or there was an error connecting.
Future get onDisconnect; Future<String> get onDisconnect;
void _update(Map map, bool mapIsRef) { void _update(Map map, bool mapIsRef) {
name = map['name']; name = map['name'];
@ -1047,7 +1047,7 @@ class FakeVM extends VM {
/// Force the VM to disconnect. /// Force the VM to disconnect.
void disconnect() { void disconnect() {
_onDisconnect.complete(this); _onDisconnect.complete('Disconnected');
} }
// Always connected. // Always connected.
@ -1062,8 +1062,8 @@ class FakeVM extends VM {
bool get isConnected => !isDisconnected; bool get isConnected => !isDisconnected;
// Only complete when requested. // Only complete when requested.
Completer _onDisconnect = new Completer(); Completer<String> _onDisconnect = new Completer<String>();
Future get onDisconnect => _onDisconnect.future; Future<String> get onDisconnect => _onDisconnect.future;
bool get isDisconnected => _onDisconnect.isCompleted; bool get isDisconnected => _onDisconnect.isCompleted;
Future<Map> invokeRpcRaw(String method, Map params) { Future<Map> invokeRpcRaw(String method, Map params) {