Make SelectedCommit and SelectedPath Generic for all views #3752
Conversation
…dReflogCommit and SelectedSubCommit
| if commit == nil { | ||
| commit = commitShimFromModelCommit(self.c.Contexts().SubCommits.GetSelected()) | ||
| } | ||
| } |
There was a problem hiding this comment.
This logic doesn't make sense: we need to test which panel is focused, and set commit to LocalCommits.GetSelected() if it's the local commits panel, or to ReflogCommits.GetSelected() if it's the reflogs panel, or to SubCommits.GetSelected() if it's the subcommits panel. Or to nil if it's not any of these, although we might consider setting it to LocalCommits.GetSelected() in that case because that's probably a useful default.
I think you can use self.c.CurrentSideContext() to find out which panel is focused.
| SelectedReflogCommit: commitShimFromModelCommit(self.c.Contexts().ReflogCommits.GetSelected()), | ||
| SelectedLocalCommit: commit, | ||
| SelectedReflogCommit: commit, | ||
| SelectedCommit: commit, |
There was a problem hiding this comment.
This is backwards. We need to keep setting SelectedLocalCommit, SelectedReflogCommit, and SelectedSubCommit to what they were set to before, for backwards compatibility. Only SelectedCommit will point to one of them, depending on context; see above.
|
|
||
| if path == "" { | ||
| path = self.c.Contexts().CommitFiles.GetSelectedPath() | ||
| } |
There was a problem hiding this comment.
Same here; testing if path is empty doesn't make sense. We need to set SelectedPath to either Files.GetSelectedPath() or CommitFiles.GetSelectedPath(), depending on which view is focused.
|
Since I didn't hear back, I opened a PR to fix this properly (#3809), so I'll close this one. |
See discussion in SelectedSubCommit is nil in the commits tab #3663
Fixes #3663
go generate ./...)