mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-12 16:46:25 -04:00
d3bf88c52c
Escaping a patch explorer (staging / patch building) back to the focused main view it was entered from used to replay a numeric scroll position and selection index captured on the way in. But the reason to escape after staging or dropping a hunk is that the content changed, so a saved index points at the wrong line — and the host auto-advances the explorer's selection to a still-valid line anyway, which is the line the user actually cares about returning to. Restore by *patch identity* instead. On escape, read the (file, type, source line) the explorer currently has selected, then have the main view's re-render land on the row that matches it: scan the incoming content as it loads (the inverse of the diff-line primitive), and once the matching row plus a screenful below it have loaded, swap the off-screen render in and scroll to / select that row in one step. FocusPoint with scrollIntoView centres the row only if it's off-screen, so the common unchanged-content escape — where the row is already where it was — doesn't move at all. If the line is gone (the content really changed), nothing is forced. This generalizes the scroll restore from a fixed origin to a predicate (RenderRestore: FirstPaintReady decides when the saved position is reachable, Apply re-establishes it), folding the separate selection restore into the same first paint — so it no longer rides a post-load callback that could fire early. The restore also now survives task replacement, which the numeric version did not: a periodic refresh can stop the escape's re-render before it first-paints. The pending restore is held on the buffer manager and is *not* cleared when a task starts, so the replacement task picks it up. It is not gated on the command key — staging the last unstaged hunk re-renders `git diff` as `git diff --cached`, a different command, yet the line to land on is still in the new content — but validates itself: the scan finds the target line only when the content still contains it, so applying it to a different item is a harmless no-op. A task clears it once it has applied it (found or not), so it lives for exactly one re-render. Because the restore is anchored on content identity and is idempotent, "survive replacement" and "restore by identity" are one mechanism, not two. With the identity in hand the snapshot no longer needs the captured scroll/index; they're derived from the explorer's live selection. |
||
|---|---|---|
| .. | ||
| context | ||
| controllers | ||
| filetree | ||
| mergeconflicts | ||
| modes | ||
| patch_exploring | ||
| popup | ||
| presentation | ||
| services/custom_commands | ||
| status | ||
| style | ||
| types | ||
| background.go | ||
| command_log_panel.go | ||
| context.go | ||
| context_config.go | ||
| controllers.go | ||
| dummies.go | ||
| editors.go | ||
| extras_panel.go | ||
| global_handlers.go | ||
| gui.go | ||
| gui_common.go | ||
| gui_driver.go | ||
| information_panel.go | ||
| keybindings.go | ||
| layout.go | ||
| main_panels.go | ||
| menu_panel.go | ||
| options_map.go | ||
| pty.go | ||
| pty_test.go | ||
| recent_repos_panel.go | ||
| side_panels.go | ||
| side_panels_test.go | ||
| tasks_adapter.go | ||
| tasks_adapter_test.go | ||
| test_mode.go | ||
| test_timeout_norace.go | ||
| test_timeout_race.go | ||
| view_helpers.go | ||
| views.go | ||