mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-25 12:24:47 +02:00
64cd7cd9f6
There are two ways to jump to the editor on a specific line: pressing `e` in the staging or patch building panels, or clicking on a hyperlink in a delta diff. In both cases, this works perfectly in the unstaged changes view, but in other views (either staged changes, or an older commit) it can often jump to the wrong line; this happens when there are further changes to the file being viewed in later commits or in unstaged changes. This commit fixes this so that you end up on the right line in these cases.
96 lines
2.5 KiB
Go
96 lines
2.5 KiB
Go
package context
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/presentation"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
type ReflogCommitsContext struct {
|
|
*FilteredListViewModel[*models.Commit]
|
|
*ListContextTrait
|
|
}
|
|
|
|
var (
|
|
_ types.IListContext = (*ReflogCommitsContext)(nil)
|
|
_ types.DiffableContext = (*ReflogCommitsContext)(nil)
|
|
)
|
|
|
|
func NewReflogCommitsContext(c *ContextCommon) *ReflogCommitsContext {
|
|
viewModel := NewFilteredListViewModel(
|
|
func() []*models.Commit { return c.Model().FilteredReflogCommits },
|
|
func(commit *models.Commit) []string {
|
|
return []string{commit.ShortHash(), commit.Name}
|
|
},
|
|
)
|
|
|
|
getDisplayStrings := func(_ int, _ int) [][]string {
|
|
return presentation.GetReflogCommitListDisplayStrings(
|
|
viewModel.GetItems(),
|
|
c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,
|
|
c.Modes().CherryPicking.SelectedHashSet(),
|
|
c.Modes().Diffing.Ref,
|
|
time.Now(),
|
|
c.UserConfig().Gui.TimeFormat,
|
|
c.UserConfig().Gui.ShortTimeFormat,
|
|
c.UserConfig().Git.ParseEmoji,
|
|
)
|
|
}
|
|
|
|
return &ReflogCommitsContext{
|
|
FilteredListViewModel: viewModel,
|
|
ListContextTrait: &ListContextTrait{
|
|
Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
|
|
View: c.Views().ReflogCommits,
|
|
WindowName: "commits",
|
|
Key: REFLOG_COMMITS_CONTEXT_KEY,
|
|
Kind: types.SIDE_CONTEXT,
|
|
Focusable: true,
|
|
NeedsRerenderOnWidthChange: types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES,
|
|
})),
|
|
ListRenderer: ListRenderer{
|
|
list: viewModel,
|
|
getDisplayStrings: getDisplayStrings,
|
|
},
|
|
c: c,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (self *ReflogCommitsContext) CanRebase() bool {
|
|
return false
|
|
}
|
|
|
|
func (self *ReflogCommitsContext) GetSelectedRef() types.Ref {
|
|
commit := self.GetSelected()
|
|
if commit == nil {
|
|
return nil
|
|
}
|
|
return commit
|
|
}
|
|
|
|
func (self *ReflogCommitsContext) GetSelectedRefRangeForDiffFiles() *types.RefRange {
|
|
// It doesn't make much sense to show a range diff between two reflog entries.
|
|
return nil
|
|
}
|
|
|
|
func (self *ReflogCommitsContext) GetCommits() []*models.Commit {
|
|
return self.getModel()
|
|
}
|
|
|
|
func (self *ReflogCommitsContext) GetDiffTerminals() []string {
|
|
itemId := self.GetSelectedItemId()
|
|
|
|
return []string{itemId}
|
|
}
|
|
|
|
func (self *ReflogCommitsContext) RefForAdjustingLineNumberInDiff() string {
|
|
return self.GetSelectedItemId()
|
|
}
|
|
|
|
func (self *ReflogCommitsContext) ShowBranchHeadsInSubCommits() bool {
|
|
return false
|
|
}
|