Commit 0ac2232e authored by Devon Carew's avatar Devon Carew Committed by GitHub

normalize the reload result messages (#11131)

parent 834fbcb8
...@@ -313,7 +313,7 @@ class HotRunner extends ResidentRunner { ...@@ -313,7 +313,7 @@ class HotRunner extends ResidentRunner {
restartTimer.start(); restartTimer.start();
final bool updatedDevFS = await _updateDevFS(); final bool updatedDevFS = await _updateDevFS();
if (!updatedDevFS) if (!updatedDevFS)
return new OperationResult(1, 'DevFS Synchronization Failed'); return new OperationResult(1, 'DevFS synchronization failed');
// Check if the isolate is paused and resume it. // Check if the isolate is paused and resume it.
for (FlutterDevice device in flutterDevices) { for (FlutterDevice device in flutterDevices) {
for (FlutterView view in device.views) { for (FlutterView view in device.views) {
...@@ -394,7 +394,7 @@ class HotRunner extends ResidentRunner { ...@@ -394,7 +394,7 @@ class HotRunner extends ResidentRunner {
timer.stop(); timer.stop();
status.cancel(); status.cancel();
if (result.isOk) if (result.isOk)
printStatus("Reloaded ${result.message} in ${getElapsedAsMilliseconds(timer.elapsed)}."); printStatus("${result.message} in ${getElapsedAsMilliseconds(timer.elapsed)}.");
return result; return result;
} catch (error) { } catch (error) {
status.cancel(); status.cancel();
...@@ -436,7 +436,7 @@ class HotRunner extends ResidentRunner { ...@@ -436,7 +436,7 @@ class HotRunner extends ResidentRunner {
} }
final bool updatedDevFS = await _updateDevFS(); final bool updatedDevFS = await _updateDevFS();
if (!updatedDevFS) if (!updatedDevFS)
return new OperationResult(1, 'DevFS Synchronization Failed'); return new OperationResult(1, 'DevFS synchronization failed');
if (benchmarkMode) { if (benchmarkMode) {
devFSTimer.stop(); devFSTimer.stop();
// Record time it took to synchronize to DevFS. // Record time it took to synchronize to DevFS.
...@@ -444,7 +444,7 @@ class HotRunner extends ResidentRunner { ...@@ -444,7 +444,7 @@ class HotRunner extends ResidentRunner {
devFSTimer.elapsed.inMilliseconds; devFSTimer.elapsed.inMilliseconds;
} }
if (!updatedDevFS) if (!updatedDevFS)
return new OperationResult(1, 'Dart Source Error'); return new OperationResult(1, 'Dart source error');
String reloadMessage; String reloadMessage;
try { try {
final String entryPath = fs.path.relative(mainPath, from: projectRootPath); final String entryPath = fs.path.relative(mainPath, from: projectRootPath);
...@@ -464,13 +464,13 @@ class HotRunner extends ResidentRunner { ...@@ -464,13 +464,13 @@ class HotRunner extends ResidentRunner {
if (!validateReloadReport(reloadReport)) { if (!validateReloadReport(reloadReport)) {
// Reload failed. // Reload failed.
flutterUsage.sendEvent('hot', 'reload-reject'); flutterUsage.sendEvent('hot', 'reload-reject');
return new OperationResult(1, 'reload rejected'); return new OperationResult(1, 'Reload rejected');
} else { } else {
flutterUsage.sendEvent('hot', 'reload'); flutterUsage.sendEvent('hot', 'reload');
final int loadedLibraryCount = reloadReport['details']['loadedLibraryCount']; final int loadedLibraryCount = reloadReport['details']['loadedLibraryCount'];
final int finalLibraryCount = reloadReport['details']['finalLibraryCount']; final int finalLibraryCount = reloadReport['details']['finalLibraryCount'];
printTrace('reloaded $loadedLibraryCount of $finalLibraryCount libraries'); printTrace('reloaded $loadedLibraryCount of $finalLibraryCount libraries');
reloadMessage = '$loadedLibraryCount of $finalLibraryCount libraries'; reloadMessage = 'Reloaded $loadedLibraryCount of $finalLibraryCount libraries';
} }
} catch (error, st) { } catch (error, st) {
printError("Hot reload failed: $error\n$st"); printError("Hot reload failed: $error\n$st");
......
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