sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

feat(gui): show file icons

Browse Source
This commit is contained in:
Ryooooooga
2022-04-23 10:14:42 +09:00
parent 8b103b16bd
commit b07aeda5a6
5 changed files with 363 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,11 +6,14 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/commands/patch"
"github.com/jesseduffield/lazygit/pkg/gui/filetree"
"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
"github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/jesseduffield/lazygit/pkg/theme"
"github.com/jesseduffield/lazygit/pkg/utils"
)
var showFileIcon = false
const (
EXPANDED_ARROW = "▼"
COLLAPSED_ARROW = "►"
@ -154,9 +157,16 @@ func getFileLine(hasUnstagedChanges bool, hasStagedChanges bool, name string, di
output += restColor.Sprint(" ")
}
isSubmodule := file != nil && file.IsSubmodule(submoduleConfigs)
isDirectory := file == nil
if showFileIcon {
output += restColor.Sprintf("%s ", icons.IconForFile(name, isSubmodule, isDirectory))
}
output += restColor.Sprint(utils.EscapeSpecialChars(name))
if file != nil && file.IsSubmodule(submoduleConfigs) {
if isSubmodule {
output += theme.DefaultTextColor.Sprint(" (submodule)")
}
@ -178,12 +188,23 @@ func getCommitFileLine(name string, diffName string, commitFile *models.CommitFi
}
}
output := ""
name = utils.EscapeSpecialChars(name)
if commitFile == nil {
return colour.Sprint(name)
if commitFile != nil {
output += getColorForChangeStatus(commitFile.ChangeStatus).Sprint(commitFile.ChangeStatus) + " "
}
return getColorForChangeStatus(commitFile.ChangeStatus).Sprint(commitFile.ChangeStatus) + " " + colour.Sprint(name)
// isSubmodule := commitFile != nil && commitFile.IsSubmodule(submoduleConfigs)
isSubmodule := false // TODO: submodule
isDirectory := commitFile == nil
if showFileIcon {
output += colour.Sprintf("%s ", icons.IconForFile(name, isSubmodule, isDirectory))
}
output += colour.Sprint(name)
return output
}
func getColorForChangeStatus(changeStatus string) style.TextStyle {
@ -202,3 +223,7 @@ func getColorForChangeStatus(changeStatus string) style.TextStyle {
return theme.DefaultTextColor
}
}
func SetShowFileIcon(show bool) {
showFileIcon = show
}