Repository navigation
Fix diff rendering after scrolling far down - #6120
Merged
Merged
Conversation
If the main view is scrolled more than about 5000 lines down a diff and another commit is selected, the main view keeps showing the previous diff, as long as the new one is longer than 5000 lines as well. Similarly, if the jump-to-file menu of the commits panel is used to go to the last file of such a diff, the file's header ends up at the top of the view with blank space below the end of the diff. This happens even with gui.scrollPastBottom set to false. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
A jump in a pane that isn't focused is going to stop at the last screenful of the diff as well. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
With gui.scrollPastBottom set to false, picking the last file of a long diff from the jump-to-file menu of the commits panel scrolls that file to the top of the view. This leaves blank space below the end of the diff. A jump in a pane that isn't focused puts the file at the top of the view and leaves it to the layout to stop at the end of the diff. But the layout doesn't do this while the view is loading. Picking an item from the menu closes the menu first, and the commits panel starts a re-render of the diff as it gets the focus back. So the view is loading when the jump happens, and the layout corrects the position only in a later pass after the re-render has finished. For a long diff the re-render never finishes; a later commit fixes this. Clicking a file in the diffstat doesn't close a menu, so it doesn't have the problem. Stop the jump at the last screenful of the diff, as a jump in the focused pane does. Like that one, it stops there whatever gui.scrollPastBottom is set to. The diff in click_a_file_in_a_diff_stat_that_comes_first fits on screen, so the jump doesn't scroll it any more. Make it longer than the view. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
If the main view is scrolled more than about 5000 lines down a diff and another commit with a diff of more than 5000 lines is selected, the main view keeps showing the previous diff. A render reads its command's output into an off-screen buffer, and shows it only once it has read enough lines to fill the view or has reached the end of the output. It then reads on as far as an accurate scrollbar needs, and waits for the user to scroll further. Both counts include the lines above the view, so that a re-render of the diff the user is scrolled into fills the view where it is. But the 5000-line cap that is meant for the scrollbar applies to the lines above the view as well. So if the view is scrolled further down than that, the render stops reading before it has filled the view, and never shows anything. The view also counts as loading until the next render starts, so the layout doesn't keep it from scrolling past the end of the diff in the meantime. This has been a problem since 9e23111 made renders read into an off-screen buffer. Before that, the lines of a render that stopped early showed up anyway. Apply the cap to the lines for the scrollbar only. Also never ask for fewer lines than fill the view. A view no more than four lines tall needs fewer lines than that for its scrollbar, even at the top of a diff. A render of another diff shows it from the top, so it doesn't need the lines above the view at all. A later commit stops it from reading them. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
The request for the first lines of a render is going to say how many lines there are above the view, and the unnamed fields of these literals would all need another value for it. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
A render first reads enough lines to fill the view, plus the lines above the view, so that a re-render of the diff the user is scrolled into fills the view where it is. But a render of another diff, such as the diff of another commit, is shown from the top. So if the view is scrolled far down a long diff, the next diff only shows up once the lines above the view have been read as well. For a diff of a few hundred thousand lines this takes a noticeable while, especially with a diff renderer such as delta. ViewBufferManager decides whether a render keeps the view where it is (see newContentPending). So let linesToReadFromCmdTask count the lines from the top of the view and pass on how many lines are above it, and let the task add those only if it keeps the view where it is. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix a regression introduced in v0.65.0: if the main view is scrolled more than about 5000 lines down a diff and another commit with a diff of more than 5000 lines is selected, the main view kept showing the previous diff. Switching between the two long commits then didn't update the main view at all. Only selecting a shorter commit would get this unstuck.
Along the way, fix another smaller bug and a performance problem; see commit messages for details.