remove collapsed field

pkg/commands/models/file_change_interface.go

@@ -1,5 +1,6 @@
 package models
 
+// sometimes we need to deal with either a node (which contains a file) or an actual file
 type IFileChange interface {
 	GetHasUnstagedChanges() bool
 	GetHasStagedChanges() bool

pkg/commands/models/file_change_node.go

@@ -12,8 +12,7 @@ type FileChangeNode struct {
 	Children         []*FileChangeNode
 	File             *File
 	Path             string // e.g. '/path/to/mydir'
-	Collapsed        bool
+	CompressionLevel int    // equal to the number of forward slashes you'll see in the path when it's rendered in tree mode
-	CompressionLevel int // equal to the number of forward slashes you'll see in the path when it's rendered in tree mode
 }
 
 func (s *FileChangeNode) GetHasUnstagedChanges() bool {

pkg/gui/file_change_manager_test.go

@@ -9,9 +9,10 @@ import (
 
 func TestRender(t *testing.T) {
 	scenarios := []struct {
-		name     string
+		name           string
-		root     *models.FileChangeNode
+		root           *models.FileChangeNode
-		expected []string
+		collapsedPaths map[string]bool
+		expected       []string
 	}{
 		{
 			name:     "nil node",
@@ -34,13 +35,16 @@ func TestRender(t *testing.T) {
 				Path: "",
 				Children: []*models.FileChangeNode{
 					{
-						Path:      "dir1",
+						Path: "dir1",
-						Collapsed: true,
 						Children: []*models.FileChangeNode{
 							{
 								File: &models.File{Name: "dir1/file2", ShortStatus: "M ", HasUnstagedChanges: true},
 								Path: "dir1/file2",
 							},
+							{
+								File: &models.File{Name: "dir1/file3", ShortStatus: "M ", HasUnstagedChanges: true},
+								Path: "dir1/file3",
+							},
 						},
 					},
 					{
@@ -71,15 +75,15 @@ func TestRender(t *testing.T) {
 					},
 				},
 			},
-
+			expected:       []string{"dir1 ►", "dir2 ▼", "├─ dir2 ▼", "│  ├─  M file3", "│  └─ M  file4", "└─ M  file5", "M  file1"},
-			expected: []string{"dir1 ▼", "└─ M  file2", "dir2 ▼", "├─ dir2 ▼", "│  ├─  M file3", "│  └─ M  file4", "└─ M  file5", "M  file1"},
+			collapsedPaths: map[string]bool{"dir1": true},
 		},
 	}
 
 	for _, s := range scenarios {
 		s := s
 		t.Run(s.name, func(t *testing.T) {
-			mngr := &FileChangeManager{Tree: s.root}
+			mngr := &FileChangeManager{Tree: s.root, CollapsedPaths: s.collapsedPaths}
 			result := mngr.Render("", nil)
 			assert.EqualValues(t, s.expected, result)
 		})