Commit 6a2cbfe
committed
Fixes stale single-file scope when re-entering resolve mode
A per-file resolve entry sets `resolveFocusedFilePaths`, but exiting the
mode never cleared it — every other piece of engagement state is reset in
`hideMode` except this one. A later session started from the details
header's Resolve chip (which doesn't pass a scope) then silently reused
the previous session's single-file focus instead of targeting all
conflicted files. Clears the focus on resolve-mode exit, scoped to the
exiting mode so a compose→resolve switch can't wipe a focus the entry
point just set.1 parent c5510eb commit 6a2cbfe
1 file changed
Lines changed: 5 additions & 0 deletions
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
646 | 646 | | |
647 | 647 | | |
648 | 648 | | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
649 | 654 | | |
650 | 655 | | |
651 | 656 | | |
| |||
0 commit comments