sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Address PR comments

Browse Source
This commit is contained in:
Joel Baranick
2022-09-10 22:36:47 -07:00
committed by Jesse Duffield
parent 1ce9a87544
commit db02c13bf6
7 changed files with 74 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/gui/presentation/worktrees.go
View File

@ -1,34 +1,26 @@
package presentation
import (
"github.com/jesseduffield/generics/slices"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
"github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/jesseduffield/lazygit/pkg/theme"
)
func GetWorktreeListDisplayStrings(worktrees []*models.Worktree) [][]string {
return slices.Map(worktrees, func(worktree *models.Worktree) []string {
return getWorktreeDisplayStrings(worktree)
})
}
// getWorktreeDisplayStrings returns the display string of branch
func getWorktreeDisplayStrings(w *models.Worktree) []string {
func GetWorktreeDisplayString(isCurrent bool, isPathMissing bool, worktree *models.Worktree) []string {
textStyle := theme.DefaultTextColor
current := ""
currentColor := style.FgCyan
if w.Current() {
if isCurrent {
current = " *"
currentColor = style.FgGreen
}
icon := icons.IconForWorktree(w, false)
if w.Missing() {
icon := icons.IconForWorktree(worktree, false)
if isPathMissing {
textStyle = style.FgRed
icon = icons.IconForWorktree(w, true)
icon = icons.IconForWorktree(worktree, true)
}
res := make([]string, 0, 3)
@ -36,6 +28,6 @@ func getWorktreeDisplayStrings(w *models.Worktree) []string {
if icons.IsIconEnabled() {
res = append(res, textStyle.Sprint(icon))
}
res = append(res, textStyle.Sprint(w.Name()))
res = append(res, textStyle.Sprint(worktree.Name()))
return res
}