Commit 0e63e470 authored by Yegor's avatar Yegor Committed by GitHub

Revert "Detect when isolate reload is barred and inform the user (#5582)" (#5590)

This reverts commit 09e68c33.

AOT snapshotter is broken at this engine rev.

https://flutter-dashboard.appspot.com/api/get-log?ownerKey=ahNzfmZsdXR0ZXItZGFzaGJvYXJkclgLEglDaGVja2xpc3QiOGZsdXR0ZXIvZmx1dHRlci8wOWU2OGMzM2NjZGIzNTVmZWRkNzVhODcxNmRlMDU1MWM3NzJmMmRlDAsSBFRhc2sYgICAgICAwAgM
parent 91b6319a
b2e592592fa070afebd7c062cad245d152a4d370 28e9b3bc49a83cf5d7a1da2222c02f0f929b1909
...@@ -445,18 +445,9 @@ class HotRunner extends ResidentRunner { ...@@ -445,18 +445,9 @@ class HotRunner extends ResidentRunner {
} else { } else {
flutterUsage.sendEvent('hot', 'reload'); flutterUsage.sendEvent('hot', 'reload');
} }
} catch (error, st) { } catch (errorMessage, 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'];
reloadStatus.stop(showElapsedTime: true); reloadStatus.stop(showElapsedTime: true);
printError('Hot reload failed:\ncode = $errorCode\nmessage = $errorMessage\n$st'); printError('Hot reload failed:\n$errorMessage\n$st');
return false; return false;
} }
await _evictDirtyAssets(); await _evictDirtyAssets();
......
...@@ -749,18 +749,12 @@ class Isolate extends ServiceObjectOwner { ...@@ -749,18 +749,12 @@ class Isolate extends ServiceObjectOwner {
_upgradeCollection(map, this); _upgradeCollection(map, this);
} }
static final int kIsolateReloadBarred = 1005;
Future<Map<String, dynamic>> reloadSources() async { Future<Map<String, dynamic>> reloadSources() async {
try { try {
Map<String, dynamic> response = await invokeRpcRaw('_reloadSources'); Map<String, dynamic> response = await invokeRpcRaw('_reloadSources');
return response; return response;
} on rpc.RpcException catch(e) { } catch (e) {
return new Future<Map<String, dynamic>>.error(<String, dynamic>{ return new Future<Map<String, dynamic>>.error(e.data['details']);
'code': e.code,
'message': e.message,
'data': e.data,
});
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment