Repository navigation
Commit 383b618
authored
Revert: [flutter_tools] Intercept prohibited hot reloads in widget preview and trigger hot restart (flutter#193968)
Reverts: [[flutter_tools] Intercept prohibited hot reloads in widget
preview and trigger hot
restart](flutter#193447)
Initiated by: @bkonyi
Reason for reverting: conflicting changes with
flutter#192831 are causing failures due
to concurrent merge
Original PR Author: @bkonyi
Reviewed By: @srawlins
The original PR description is provided below:
When hot reload fails due to unsupported changes (such as class
hierarchy modifications, global initializer changes, or file
additions/deletions) in `flutter widget-preview`, automatically fall
back to a hot restart instead of leaving the previewer in a failed
reload state.
### Changes
- **`ResidentWebRunner`**: Attach `updateFSReport` to the failed
`OperationResult` when `_updateDevFS` fails so callers can inspect
`UpdateFSReport.hotReloadRejected`.
- **`WidgetPreviewStartCommand`**: Introduce `handleReload()` (invoked
inside `_triggerReload` for `.hotReload` requests so the fallback
remains serialized with other reload and restart requests, and add a
`@visibleForTesting` `widgetPreviewApp` setter), which checks if
`restart()` returned an `OperationResult` with
`UpdateFSReport(hotReloadRejected: true)`. When rejected, log a status
message (`kHotReloadRejectedMessage`) and invoke `restart(fullRestart:
true)`.
Fixes flutter#192697
## Pre-launch Checklist
- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.
<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md1 parent ec3293c commit 383b618
4 files changed
Lines changed: 7 additions & 151 deletions
File tree
- packages/flutter_tools
- lib/src
- commands
- isolated
- test
- commands.shard/permeable/widget_preview
- general.shard
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
| |||
141 | 140 | | |
142 | 141 | | |
143 | 142 | | |
144 | | - | |
145 | | - | |
| 143 | + | |
146 | 144 | | |
147 | 145 | | |
148 | 146 | | |
| |||
221 | 219 | | |
222 | 220 | | |
223 | 221 | | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | 222 | | |
229 | 223 | | |
230 | 224 | | |
| |||
328 | 322 | | |
329 | 323 | | |
330 | 324 | | |
331 | | - | |
332 | | - | |
333 | | - | |
334 | 325 | | |
335 | 326 | | |
336 | 327 | | |
| |||
513 | 504 | | |
514 | 505 | | |
515 | 506 | | |
516 | | - | |
517 | | - | |
518 | | - | |
519 | | - | |
520 | | - | |
521 | | - | |
522 | | - | |
523 | | - | |
524 | | - | |
525 | | - | |
526 | | - | |
527 | | - | |
528 | 507 | | |
529 | 508 | | |
530 | 509 | | |
| |||
547 | 526 | | |
548 | 527 | | |
549 | 528 | | |
550 | | - | |
551 | | - | |
552 | | - | |
553 | | - | |
554 | | - | |
555 | | - | |
| 529 | + | |
556 | 530 | | |
557 | 531 | | |
558 | 532 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
493 | 493 | | |
494 | 494 | | |
495 | 495 | | |
496 | | - | |
| 496 | + | |
497 | 497 | | |
498 | 498 | | |
499 | 499 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
159 | 159 | | |
160 | 160 | | |
161 | 161 | | |
162 | | - | |
| 162 | + | |
163 | 163 | | |
164 | | - | |
165 | 164 | | |
166 | 165 | | |
167 | 166 | | |
| |||
200 | 199 | | |
201 | 200 | | |
202 | 201 | | |
203 | | - | |
| 202 | + | |
204 | 203 | | |
205 | 204 | | |
206 | 205 | | |
| |||
1140 | 1139 | | |
1141 | 1140 | | |
1142 | 1141 | | |
1143 | | - | |
1144 | 1142 | | |
1145 | | - | |
1146 | | - | |
1147 | | - | |
1148 | | - | |
1149 | | - | |
1150 | | - | |
1151 | | - | |
1152 | | - | |
1153 | | - | |
1154 | | - | |
1155 | | - | |
1156 | 1143 | | |
1157 | 1144 | | |
1158 | 1145 | | |
| |||
1256 | 1243 | | |
1257 | 1244 | | |
1258 | 1245 | | |
1259 | | - | |
1260 | | - | |
1261 | | - | |
1262 | | - | |
1263 | | - | |
1264 | | - | |
1265 | | - | |
1266 | | - | |
1267 | | - | |
1268 | | - | |
1269 | | - | |
1270 | | - | |
1271 | | - | |
1272 | | - | |
1273 | | - | |
1274 | | - | |
1275 | | - | |
1276 | | - | |
1277 | | - | |
1278 | | - | |
1279 | | - | |
1280 | | - | |
1281 | | - | |
| 1246 | + | |
1282 | 1247 | | |
1283 | 1248 | | |
1284 | 1249 | | |
1285 | 1250 | | |
1286 | 1251 | | |
1287 | | - | |
| 1252 | + | |
1288 | 1253 | | |
1289 | 1254 | | |
1290 | 1255 | | |
| |||
1301 | 1266 | | |
1302 | 1267 | | |
1303 | 1268 | | |
1304 | | - | |
1305 | | - | |
1306 | | - | |
1307 | | - | |
1308 | | - | |
1309 | | - | |
1310 | | - | |
1311 | | - | |
1312 | | - | |
1313 | | - | |
1314 | | - | |
1315 | | - | |
1316 | | - | |
1317 | | - | |
1318 | | - | |
1319 | | - | |
1320 | | - | |
1321 | | - | |
1322 | | - | |
1323 | | - | |
1324 | | - | |
1325 | | - | |
1326 | | - | |
1327 | | - | |
1328 | | - | |
1329 | | - | |
1330 | | - | |
1331 | | - | |
1332 | | - | |
1333 | | - | |
1334 | | - | |
1335 | | - | |
1336 | | - | |
1337 | | - | |
1338 | | - | |
1339 | | - | |
1340 | | - | |
1341 | | - | |
1342 | | - | |
1343 | | - | |
1344 | | - | |
1345 | | - | |
1346 | | - | |
1347 | | - | |
1348 | | - | |
1349 | | - | |
1350 | | - | |
1351 | | - | |
1352 | | - | |
1353 | | - | |
1354 | | - | |
1355 | | - | |
1356 | | - | |
1357 | | - | |
1358 | | - | |
1359 | | - | |
1360 | | - | |
1361 | | - | |
1362 | | - | |
1363 | | - | |
1364 | | - | |
1365 | | - | |
1366 | | - | |
1367 | | - | |
1368 | | - | |
1369 | | - | |
1370 | | - | |
1371 | | - | |
1372 | | - | |
1373 | | - | |
1374 | | - | |
1375 | | - | |
1376 | | - | |
1377 | | - | |
1378 | | - | |
1379 | | - | |
1380 | | - | |
1381 | | - | |
1382 | | - | |
1383 | | - | |
1384 | | - | |
1385 | | - | |
1386 | 1269 | | |
1387 | 1270 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1111 | 1111 | | |
1112 | 1112 | | |
1113 | 1113 | | |
1114 | | - | |
1115 | 1114 | | |
1116 | 1115 | | |
1117 | 1116 | | |
| |||
0 commit comments