go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-09 13:47:11 +02:00
Code Issues Releases Activity

fix bug for combining directories with single child

Browse Source
This commit is contained in:
Jesse Duffield 2021-03-14 20:23:06 +11:00
parent a31db3df9c
commit def68ddc8f
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/commands/models/status_line_node.go
View File

@ -157,10 +157,6 @@ func (s *StatusLineNode) GetPath() string {
return s.Path
}
func (s *StatusLineNode) HasExactlyOneChild() bool {
return len(s.Children) == 1
}
func (s *StatusLineNode) Compress() {
if s == nil {
return
@ -174,10 +170,10 @@ func (s *StatusLineNode) compressAux() *StatusLineNode {
return s
}
for i, child := range s.Children {
if child.HasExactlyOneChild() {
grandchild := child.Children[0]
grandchild.Name = fmt.Sprintf("%s/%s", child.Name, grandchild.Name)
for i := range s.Children {
for s.Children[i].HasExactlyOneChild() {
grandchild := s.Children[i].Children[0]
grandchild.Name = fmt.Sprintf("%s/%s", s.Children[i].Name, grandchild.Name)
s.Children[i] = grandchild
}
}
@ -188,3 +184,7 @@ func (s *StatusLineNode) compressAux() *StatusLineNode {
return s
}
func (s *StatusLineNode) HasExactlyOneChild() bool {
return len(s.Children) == 1
}

22
pkg/commands/models/status_line_node_test.go
View File

@ -64,6 +64,23 @@ func TestCompress(t *testing.T) {
},
},
},
{
Name: "dir3",
Path: "dir3",
Children: []*StatusLineNode{
{
Name: "dir3-1",
Path: "dir3/dir3-1",
Children: []*StatusLineNode{
{
File: &File{Name: "file5", ShortStatus: "M ", HasUnstagedChanges: true},
Name: "file5",
Path: "dir3/dir3-1/file5",
},
},
},
},
},
{
File: &File{Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true},
Name: "file1",
@ -95,6 +112,11 @@ func TestCompress(t *testing.T) {
},
},
},
{
Name: "dir3/dir3-1/file5",
File: &File{Name: "file5", ShortStatus: "M ", HasUnstagedChanges: true},
Path: "dir3/dir3-1/file5",
},
{
File: &File{Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true},
Name: "file1",