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

support discarding submodule changes

This commit is contained in:
Jesse Duffield
2020-09-28 09:14:32 +10:00
parent ca437a6504
commit b8da166ab1
10 changed files with 174 additions and 76 deletions

View File

@ -7,19 +7,19 @@ import (
"github.com/jesseduffield/lazygit/pkg/utils"
)
func GetFileListDisplayStrings(files []*commands.File, diffName string) [][]string {
func GetFileListDisplayStrings(files []*commands.File, diffName string, submoduleConfigs []*commands.SubmoduleConfig) [][]string {
lines := make([][]string, len(files))
for i := range files {
diffed := files[i].Name == diffName
lines[i] = getFileDisplayStrings(files[i], diffed)
lines[i] = getFileDisplayStrings(files[i], diffed, submoduleConfigs)
}
return lines
}
// getFileDisplayStrings returns the display string of branch
func getFileDisplayStrings(f *commands.File, diffed bool) []string {
func getFileDisplayStrings(f *commands.File, diffed bool, submoduleConfigs []*commands.SubmoduleConfig) []string {
// potentially inefficient to be instantiating these color
// objects with each render
red := color.New(color.FgRed)
@ -55,7 +55,7 @@ func getFileDisplayStrings(f *commands.File, diffed bool) []string {
output += secondCharCl.Sprint(secondChar)
output += restColor.Sprintf(" %s", f.Name)
if f.IsSubmodule {
if f.IsSubmodule(submoduleConfigs) {
output += utils.ColoredString(" (submodule)", theme.DefaultTextColor)
}