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

more file tree improvements

Browse Source
This commit is contained in:
Jesse Duffield
2021-03-20 13:49:43 +11:00
parent cd0532b4d6
commit c27cea6f30
4 changed files with 29 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/gui/presentation/files.go
View File

@@ -19,45 +19,53 @@ func GetFileListDisplayStrings(files []*models.File, diffName string, submoduleC
// getFileDisplayStrings returns the display string of branch
func getFileDisplayStrings(f *models.File, diffName string, submoduleConfigs []*models.SubmoduleConfig) []string {
output := GetStatusNodeLine(f.HasUnstagedChanges, f.ShortStatus, f.Name, diffName, submoduleConfigs, f)
output := GetStatusNodeLine(f.HasUnstagedChanges, f.HasStagedChanges, f.Name, diffName, submoduleConfigs, f)
return []string{output}
}
func GetStatusNodeLine(hasUnstagedChanges bool, shortStatus string, name string, diffName string, submoduleConfigs []*models.SubmoduleConfig, file *models.File) string {
func GetStatusNodeLine(hasUnstagedChanges bool, hasStagedChanges bool, name string, diffName string, submoduleConfigs []*models.SubmoduleConfig, file *models.File) string {
// potentially inefficient to be instantiating these color
// objects with each render
red := color.New(color.FgRed)
green := color.New(color.FgGreen)
diffColor := color.New(theme.DiffTerminalColor)
partiallyModifiedColor := color.New(color.FgYellow)
var restColor *color.Color
if name == diffName {
restColor = diffColor
} else if file == nil && hasStagedChanges && hasUnstagedChanges {
restColor = partiallyModifiedColor
} else if hasUnstagedChanges {
restColor = red
} else {
restColor = green
}
// this is just making things look nice when the background attribute is 'reverse'
firstChar := shortStatus[0:1]
firstCharCl := green
if firstChar == "?" {
firstCharCl = red
} else if firstChar == " " {
firstCharCl = restColor
output := ""
if file != nil {
// this is just making things look nice when the background attribute is 'reverse'
firstChar := file.ShortStatus[0:1]
firstCharCl := green
if firstChar == "?" {
firstCharCl = red
} else if firstChar == " " {
firstCharCl = restColor
}
secondChar := file.ShortStatus[1:2]
secondCharCl := red
if secondChar == " " {
secondCharCl = restColor
}
output = firstCharCl.Sprint(firstChar)
output += secondCharCl.Sprint(secondChar)
output += " "
}
secondChar := shortStatus[1:2]
secondCharCl := red
if secondChar == " " {
secondCharCl = restColor
}
output := firstCharCl.Sprint(firstChar)
output += secondCharCl.Sprint(secondChar)
output += restColor.Sprintf(" %s", name)
output += restColor.Sprint(name)
if file != nil && file.IsSubmodule(submoduleConfigs) {
output += utils.ColoredString(" (submodule)", theme.DefaultTextColor)