go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-31 22:22:14 +02:00
Code Issues Releases Activity

Change length parameter of getDisplayStrings to endIdx

Browse Source 
It's more natural to work with this way, as we will see later in this branch.
This commit is contained in:
Stefan Haller 2023-08-17 21:52:29 +02:00
parent 996e30e5d9
commit 061bfce835
17 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/context/branches_context.go
View File

@ -24,7 +24,7 @@ func NewBranchesContext(c *ContextCommon) *BranchesContext {
}, },
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetBranchListDisplayStrings( return presentation.GetBranchListDisplayStrings(
viewModel.GetItems(), viewModel.GetItems(),
c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL, c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,

2
pkg/gui/context/commit_files_context.go
View File

@ -28,7 +28,7 @@ func NewCommitFilesContext(c *ContextCommon) *CommitFilesContext {
c.UserConfig.Gui.ShowFileTree, c.UserConfig.Gui.ShowFileTree,
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
if viewModel.Len() == 0 { if viewModel.Len() == 0 {
return [][]string{{style.FgRed.Sprint("(none)")}} return [][]string{{style.FgRed.Sprint("(none)")}}
} }

4
pkg/gui/context/list_context_trait.go
View File

@ -12,7 +12,7 @@ type ListContextTrait struct {
c *ContextCommon c *ContextCommon
list types.IList list types.IList
getDisplayStrings func(startIdx int, length int) [][]string getDisplayStrings func(startIdx int, endIdx int) [][]string
// Alignment for each column. If nil, the default is left alignment // Alignment for each column. If nil, the default is left alignment
getColumnAlignments func() []utils.Alignment getColumnAlignments func() []utils.Alignment
// Some contexts, like the commit context, will highlight the path from the selected commit // Some contexts, like the commit context, will highlight the path from the selected commit
@ -59,7 +59,7 @@ func (self *ListContextTrait) FocusLine() {
func (self *ListContextTrait) refreshViewport() { func (self *ListContextTrait) refreshViewport() {
startIdx, length := self.GetViewTrait().ViewPortYBounds() startIdx, length := self.GetViewTrait().ViewPortYBounds()
displayStrings := self.getDisplayStrings(startIdx, length) displayStrings := self.getDisplayStrings(startIdx, startIdx+length)
content := utils.RenderDisplayStrings(displayStrings, nil) content := utils.RenderDisplayStrings(displayStrings, nil)
self.GetViewTrait().SetViewPortContent(content) self.GetViewTrait().SetViewPortContent(content)
} }

4
pkg/gui/context/local_commits_context.go
View File

@ -27,7 +27,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
c, c,
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(startIdx int, endIdx int) [][]string {
selectedCommitSha := "" selectedCommitSha := ""
if c.CurrentContext().GetKey() == LOCAL_COMMITS_CONTEXT_KEY { if c.CurrentContext().GetKey() == LOCAL_COMMITS_CONTEXT_KEY {
@ -56,7 +56,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
c.UserConfig.Git.ParseEmoji, c.UserConfig.Git.ParseEmoji,
selectedCommitSha, selectedCommitSha,
startIdx, startIdx,
length, endIdx,
shouldShowGraph(c), shouldShowGraph(c),
c.Model().BisectInfo, c.Model().BisectInfo,
showYouAreHereLabel, showYouAreHereLabel,

2
pkg/gui/context/menu_context.go
View File

@ -79,7 +79,7 @@ func (self *MenuViewModel) SetMenuItems(items []*types.MenuItem, columnAlignment
} }
// TODO: move into presentation package // TODO: move into presentation package
func (self *MenuViewModel) GetDisplayStrings(_startIdx int, _length int) [][]string { func (self *MenuViewModel) GetDisplayStrings(_ int, _ int) [][]string {
menuItems := self.FilteredListViewModel.GetItems() menuItems := self.FilteredListViewModel.GetItems()
showKeys := lo.SomeBy(menuItems, func(item *types.MenuItem) bool { showKeys := lo.SomeBy(menuItems, func(item *types.MenuItem) bool {
return item.Key != nil return item.Key != nil

2
pkg/gui/context/reflog_commits_context.go
View File

@ -26,7 +26,7 @@ func NewReflogCommitsContext(c *ContextCommon) *ReflogCommitsContext {
}, },
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetReflogCommitListDisplayStrings( return presentation.GetReflogCommitListDisplayStrings(
viewModel.GetItems(), viewModel.GetItems(),
c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL, c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,

2
pkg/gui/context/remote_branches_context.go
View File

@ -27,7 +27,7 @@ func NewRemoteBranchesContext(
}, },
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetRemoteBranchListDisplayStrings(viewModel.GetItems(), c.Modes().Diffing.Ref) return presentation.GetRemoteBranchListDisplayStrings(viewModel.GetItems(), c.Modes().Diffing.Ref)
} }

2
pkg/gui/context/remotes_context.go
View File

@ -24,7 +24,7 @@ func NewRemotesContext(c *ContextCommon) *RemotesContext {
}, },
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetRemoteListDisplayStrings(viewModel.GetItems(), c.Modes().Diffing.Ref) return presentation.GetRemoteListDisplayStrings(viewModel.GetItems(), c.Modes().Diffing.Ref)
} }

2
pkg/gui/context/stash_context.go
View File

@ -26,7 +26,7 @@ func NewStashContext(
}, },
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetStashEntryListDisplayStrings(viewModel.GetItems(), c.Modes().Diffing.Ref) return presentation.GetStashEntryListDisplayStrings(viewModel.GetItems(), c.Modes().Diffing.Ref)
} }

4
pkg/gui/context/sub_commits_context.go
View File

@ -36,7 +36,7 @@ func NewSubCommitsContext(
limitCommits: true, limitCommits: true,
} }
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(startIdx int, endIdx int) [][]string {
// This can happen if a sub-commits view is asked to be rerendered while // This can happen if a sub-commits view is asked to be rerendered while
// it is invisble; for example when switching screen modes, which // it is invisble; for example when switching screen modes, which
// rerenders all views. // rerenders all views.
@ -72,7 +72,7 @@ func NewSubCommitsContext(
c.UserConfig.Git.ParseEmoji, c.UserConfig.Git.ParseEmoji,
selectedCommitSha, selectedCommitSha,
startIdx, startIdx,
length, endIdx,
shouldShowGraph(c), shouldShowGraph(c),
git_commands.NewNullBisectInfo(), git_commands.NewNullBisectInfo(),
false, false,

2
pkg/gui/context/submodules_context.go
View File

@ -21,7 +21,7 @@ func NewSubmodulesContext(c *ContextCommon) *SubmodulesContext {
}, },
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetSubmoduleListDisplayStrings(viewModel.GetItems()) return presentation.GetSubmoduleListDisplayStrings(viewModel.GetItems())
} }

2
pkg/gui/context/suggestions_context.go
View File

@ -36,7 +36,7 @@ func NewSuggestionsContext(
return state.Suggestions return state.Suggestions
} }
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetSuggestionListDisplayStrings(state.Suggestions) return presentation.GetSuggestionListDisplayStrings(state.Suggestions)
} }

2
pkg/gui/context/tags_context.go
View File

@ -26,7 +26,7 @@ func NewTagsContext(
}, },
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetTagListDisplayStrings(viewModel.GetItems(), c.Modes().Diffing.Ref) return presentation.GetTagListDisplayStrings(viewModel.GetItems(), c.Modes().Diffing.Ref)
} }

2
pkg/gui/context/working_tree_context.go
View File

@ -23,7 +23,7 @@ func NewWorkingTreeContext(c *ContextCommon) *WorkingTreeContext {
c.UserConfig.Gui.ShowFileTree, c.UserConfig.Gui.ShowFileTree,
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
lines := presentation.RenderFileTree(viewModel, c.Modes().Diffing.Ref, c.Model().Submodules) lines := presentation.RenderFileTree(viewModel, c.Modes().Diffing.Ref, c.Model().Submodules)
return lo.Map(lines, func(line string, _ int) []string { return lo.Map(lines, func(line string, _ int) []string {
return []string{line} return []string{line}

2
pkg/gui/context/worktrees_context.go
View File

@ -21,7 +21,7 @@ func NewWorktreesContext(c *ContextCommon) *WorktreesContext {
}, },
) )
getDisplayStrings := func(startIdx int, length int) [][]string { getDisplayStrings := func(_ int, _ int) [][]string {
return presentation.GetWorktreeDisplayStrings( return presentation.GetWorktreeDisplayStrings(
c.Tr, c.Tr,
viewModel.GetFilteredList(), viewModel.GetFilteredList(),

4
pkg/gui/presentation/commits.go
View File

@ -52,7 +52,7 @@ func GetCommitListDisplayStrings(
parseEmoji bool, parseEmoji bool,
selectedCommitSha string, selectedCommitSha string,
startIdx int, startIdx int,
length int, endIdx int,
showGraph bool, showGraph bool,
bisectInfo *git_commands.BisectInfo, bisectInfo *git_commands.BisectInfo,
showYouAreHereLabel bool, showYouAreHereLabel bool,
@ -68,7 +68,7 @@ func GetCommitListDisplayStrings(
return nil return nil
} }
end := utils.Min(startIdx+length, len(commits)) end := utils.Min(endIdx, len(commits))
// this is where my non-TODO commits begin // this is where my non-TODO commits begin
rebaseOffset := utils.Min(indexOfFirstNonTODOCommit(commits), end) rebaseOffset := utils.Min(indexOfFirstNonTODOCommit(commits), end)

36
pkg/gui/presentation/commits_test.go
View File

@ -41,7 +41,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
parseEmoji bool parseEmoji bool
selectedCommitSha string selectedCommitSha string
startIdx int startIdx int
length int endIdx int
showGraph bool showGraph bool
bisectInfo *git_commands.BisectInfo bisectInfo *git_commands.BisectInfo
showYouAreHereLabel bool showYouAreHereLabel bool
@ -52,7 +52,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
testName: "no commits", testName: "no commits",
commits: []*models.Commit{}, commits: []*models.Commit{},
startIdx: 0, startIdx: 0,
length: 1, endIdx: 1,
showGraph: false, showGraph: false,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -66,7 +66,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit2", Sha: "sha2"}, {Name: "commit2", Sha: "sha2"},
}, },
startIdx: 0, startIdx: 0,
length: 2, endIdx: 2,
showGraph: false, showGraph: false,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -83,7 +83,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit2", Sha: "sha2"}, {Name: "commit2", Sha: "sha2"},
}, },
startIdx: 0, startIdx: 0,
length: 2, endIdx: 2,
showGraph: false, showGraph: false,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -110,7 +110,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
currentBranchName: "current-branch", currentBranchName: "current-branch",
hasUpdateRefConfig: true, hasUpdateRefConfig: true,
startIdx: 0, startIdx: 0,
length: 4, endIdx: 4,
showGraph: false, showGraph: false,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -135,7 +135,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
currentBranchName: "current-branch", currentBranchName: "current-branch",
hasUpdateRefConfig: true, hasUpdateRefConfig: true,
startIdx: 0, startIdx: 0,
length: 2, endIdx: 2,
showGraph: false, showGraph: false,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -158,7 +158,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
currentBranchName: "current-branch", currentBranchName: "current-branch",
hasUpdateRefConfig: false, hasUpdateRefConfig: false,
startIdx: 0, startIdx: 0,
length: 2, endIdx: 2,
showGraph: false, showGraph: false,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -179,7 +179,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "some-branch", CommitHash: "sha2"}, {Name: "some-branch", CommitHash: "sha2"},
}, },
startIdx: 0, startIdx: 0,
length: 3, endIdx: 3,
showGraph: false, showGraph: false,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -200,7 +200,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}}, {Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
}, },
startIdx: 0, startIdx: 0,
length: 5, endIdx: 5,
showGraph: true, showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -223,7 +223,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}}, {Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
}, },
startIdx: 0, startIdx: 0,
length: 5, endIdx: 5,
showGraph: true, showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -247,7 +247,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}}, {Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
}, },
startIdx: 1, startIdx: 1,
length: 10, endIdx: 11,
showGraph: true, showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -270,7 +270,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}}, {Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
}, },
startIdx: 3, startIdx: 3,
length: 2, endIdx: 5,
showGraph: true, showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -291,7 +291,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}}, {Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
}, },
startIdx: 0, startIdx: 0,
length: 2, endIdx: 2,
showGraph: true, showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -312,7 +312,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}}, {Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
}, },
startIdx: 4, startIdx: 4,
length: 2, endIdx: 6,
showGraph: true, showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -332,7 +332,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}}, {Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
}, },
startIdx: 0, startIdx: 0,
length: 2, endIdx: 2,
showGraph: true, showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -351,7 +351,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
{Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}}, {Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}},
}, },
startIdx: 0, startIdx: 0,
length: 5, endIdx: 5,
showGraph: true, showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -373,7 +373,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
timeFormat: "2006-01-02", timeFormat: "2006-01-02",
shortTimeFormat: "3:04PM", shortTimeFormat: "3:04PM",
startIdx: 0, startIdx: 0,
length: 2, endIdx: 2,
showGraph: false, showGraph: false,
bisectInfo: git_commands.NewNullBisectInfo(), bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitShaSet: set.New[string](), cherryPickedCommitShaSet: set.New[string](),
@ -416,7 +416,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
s.parseEmoji, s.parseEmoji,
s.selectedCommitSha, s.selectedCommitSha,
s.startIdx, s.startIdx,
s.length, s.endIdx,
s.showGraph, s.showGraph,
s.bisectInfo, s.bisectInfo,
s.showYouAreHereLabel, s.showYouAreHereLabel,