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 "Detect when isolate reload is barred and inform the user (#5582)" (#5590)

Browse Source 
This reverts commit 09e68c33cc.

AOT snapshotter is broken at this engine rev.

https://flutter-dashboard.appspot.com/api/get-log?ownerKey=ahNzfmZsdXR0ZXItZGFzaGJvYXJkclgLEglDaGVja2xpc3QiOGZsdXR0ZXIvZmx1dHRlci8wOWU2OGMzM2NjZGIzNTVmZWRkNzVhODcxNmRlMDU1MWM3NzJmMmRlDAsSBFRhc2sYgICAgICAwAgM
This commit is contained in:
Yegor 2016-08-24 16:56:10 -07:00 committed by GitHub
parent 91b6319a4f
commit 0e63e470e4
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/cache/engine.version vendored
View File

@ -1 +1 @@
b2e592592fa070afebd7c062cad245d152a4d370
28e9b3bc49a83cf5d7a1da2222c02f0f929b1909

13
packages/flutter_tools/lib/src/hot.dart
View File

@ -445,18 +445,9 @@ class HotRunner extends ResidentRunner {
} else {
flutterUsage.sendEvent('hot', 'reload');
}
} catch (error, st) {
int errorCode = error['code'];
if (errorCode == Isolate.kIsolateReloadBarred) {
printError('Unable to hot reload app due to an unrecoverable error in '
'the source code. Please address the error and then '
'Use "R" to restart the app.');
flutterUsage.sendEvent('hot', 'reload-barred');
return false;
}
String errorMessage = error['message'];
} catch (errorMessage, st) {
reloadStatus.stop(showElapsedTime: true);
printError('Hot reload failed:\ncode = $errorCode\nmessage = $errorMessage\n$st');
printError('Hot reload failed:\n$errorMessage\n$st');
return false;
}
await _evictDirtyAssets();

10
packages/flutter_tools/lib/src/vmservice.dart
View File

@ -749,18 +749,12 @@ class Isolate extends ServiceObjectOwner {
_upgradeCollection(map, this);
}
static final int kIsolateReloadBarred = 1005;
Future<Map<String, dynamic>> reloadSources() async {
try {
Map<String, dynamic> response = await invokeRpcRaw('_reloadSources');
return response;
} on rpc.RpcException catch(e) {
return new Future<Map<String, dynamic>>.error(<String, dynamic>{
'code': e.code,
'message': e.message,
'data': e.data,
});
} catch (e) {
return new Future<Map<String, dynamic>>.error(e.data['details']);
}
}