go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-28 09:08:41 +02:00
Code Issues Releases Activity

no more filterThenMap

Browse Source
This commit is contained in:
Jesse Duffield 2022-03-20 09:24:39 +11:00
parent 67a76523fb
commit e392b9f86a
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/gui/context.go
View File

@ -14,14 +14,13 @@ import (
)
func (gui *Gui) popupViewNames() []string {
return slices.FilterThenMap(gui.State.Contexts.Flatten(),
func(c types.Context) bool {
return c.GetKind() == types.PERSISTENT_POPUP || c.GetKind() == types.TEMPORARY_POPUP
},
func(c types.Context) string {
return c.GetViewName()
},
)
popups := slices.Filter(gui.State.Contexts.Flatten(), func(c types.Context) bool {
return c.GetKind() == types.PERSISTENT_POPUP || c.GetKind() == types.TEMPORARY_POPUP
})
return slices.Map(popups, func(c types.Context) string {
return c.GetViewName()
})
}
func (gui *Gui) currentContextKeyIgnoringPopups() types.ContextKey {

13
pkg/gui/controllers/helpers/cherry_pick_helper.go
View File

@ -118,14 +118,13 @@ func (self *CherryPickHelper) add(selectedCommit *models.Commit, commitsList []*
commitSet := self.CherryPickedCommitShaSet()
commitSet.Add(selectedCommit.Sha)
newCommits := slices.FilterThenMap(commitsList,
func(commit *models.Commit) bool { return commitSet.Includes(commit.Sha) },
func(commit *models.Commit) *models.Commit {
return &models.Commit{Name: commit.Name, Sha: commit.Sha}
},
)
cherryPickedCommits := slices.Filter(commitsList, func(commit *models.Commit) bool {
return commitSet.Includes(commit.Sha)
})
self.getData().CherryPickedCommits = newCommits
self.getData().CherryPickedCommits = slices.Map(cherryPickedCommits, func(commit *models.Commit) *models.Commit {
return &models.Commit{Name: commit.Name, Sha: commit.Sha}
})
}
// you can only copy from one context at a time, because the order and position of commits matter