fix glitchy render of stale data #2196
Merged
Conversation
This file contains 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
jesseduffield
changed the title
jesseduffield
commented
Oct 3, 2022
| @@ -185,7 +185,7 @@ type GuiRepoState struct { | |||
| // WindowViewNameMap is a mapping of windows to the current view of that window. | |||
| // Some views move between windows for example the commitFiles view and when cycling through | |||
| // side windows we need to know which view to give focus to for a given window | |||
| WindowViewNameMap map[string]string | |||
| WindowViewNameMap *utils.ThreadSafeMap[string, string] | |||
There was a problem hiding this comment.
had a concurrent read and write error so I'm introducing a thread safe map struct
jesseduffield
commented
Oct 3, 2022
| } | ||
| } | ||
|
|
||
| func TestThreadSafeMapConcurrentReadWrite(t *testing.T) { |
There was a problem hiding this comment.
hard to force a concurrency issue in a test but I did manage to get this to fail with a large enough range when testing against the vanilla map
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.
fixes #2107
PR Description
This fixes the issue of stale content being re-rendered when flicking through the files panel. When flicking through the files panel, a different view renders directory contents compared to file contents. This meant if you went from dir A to file B to dir C you would briefly see dir A's content again as you select dir C because it first brings the directory main view to the top and then clears it and loads dir C's contents.
We could clear any views upon them no longer being at the top of the window but we'd then see a flicker as content goes to black before being replaced. Here we instead copy the content of the currently top view to the next view before moving that view to the top of the window.
An alternative approach is to instead only use one view but we've committed to having one set of keybindings per view and the view shown when viewing files had keybindings associated that allow clicking on the main view for the sake of starting a session in the staging view. We'll see if this pays off in the end or just makes things more complicated.
go run scripts/cheatsheet/main.go generate)docs/Config.md) have been updated if necessary