From 46b79c7c61b718644e0d31f533c6e15a95475245 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 21 Mar 2021 10:03:51 +1100
Subject: drop Name field from status line node

---
 pkg/commands/models/status_line_node.go |  5 ++---
 pkg/gui/status_line_manager_test.go     | 22 +++++++++++-----------
 pkg/gui/status_tree.go                  |  2 --
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkg/commands/models/status_line_node.go b/pkg/commands/models/status_line_node.go
index 0bf3e8c3d..94527ee9f 100644
--- a/pkg/commands/models/status_line_node.go
+++ b/pkg/commands/models/status_line_node.go
@@ -11,7 +11,6 @@ import (
 type StatusLineNode struct {
 	Children  []*StatusLineNode
 	File      *File
-	Name      string // e.g. 'mydir'
 	Path      string // e.g. '/path/to/mydir'
 	Collapsed bool
 }
@@ -146,7 +145,7 @@ func (s *StatusLineNode) sortChildren() {
 			return false
 		}
 
-		return sortedChildren[i].Name < sortedChildren[j].Name
+		return sortedChildren[i].Path < sortedChildren[j].Path
 	})
 
 	// TODO: think about making this in-place
@@ -243,7 +242,7 @@ func (s *StatusLineNode) ForEachFile(cb func(*File) error) error {
 }
 
 func (s *StatusLineNode) NameAtDepth(depth int) string {
-	splitName := strings.Split(s.Name, string(os.PathSeparator))
+	splitName := strings.Split(s.Path, string(os.PathSeparator))
 	name := filepath.Join(splitName[depth:]...)
 
 	if s.File != nil && s.File.IsRename() {
diff --git a/pkg/gui/status_line_manager_test.go b/pkg/gui/status_line_manager_test.go
index 84d7bb9f1..7ef5c15e6 100644
--- a/pkg/gui/status_line_manager_test.go
+++ b/pkg/gui/status_line_manager_test.go
@@ -21,9 +21,9 @@ func TestRender(t *testing.T) {
 		{
 			name: "leaf node",
 			root: &models.StatusLineNode{
-				Name: "",
+				Path: "",
 				Children: []*models.StatusLineNode{
-					{File: &models.File{Name: "test", ShortStatus: " M", HasStagedChanges: true}, Name: "test"},
+					{File: &models.File{Name: "test", ShortStatus: " M", HasStagedChanges: true}, Path: "test"},
 				},
 			},
 			expected: []string{" M test"},
@@ -31,43 +31,43 @@ func TestRender(t *testing.T) {
 		{
 			name: "big example",
 			root: &models.StatusLineNode{
-				Name: "",
+				Path: "",
 				Children: []*models.StatusLineNode{
 					{
-						Name:      "dir1",
+						Path:      "dir1",
 						Collapsed: true,
 						Children: []*models.StatusLineNode{
 							{
 								File: &models.File{Name: "file2", ShortStatus: "M ", HasUnstagedChanges: true},
-								Name: "file2",
+								Path: "file2",
 							},
 						},
 					},
 					{
-						Name: "dir2",
+						Path: "dir2",
 						Children: []*models.StatusLineNode{
 							{
-								Name: "dir2",
+								Path: "dir2",
 								Children: []*models.StatusLineNode{
 									{
 										File: &models.File{Name: "file3", ShortStatus: " M", HasStagedChanges: true},
-										Name: "file3",
+										Path: "file3",
 									},
 									{
 										File: &models.File{Name: "file4", ShortStatus: "M ", HasUnstagedChanges: true},
-										Name: "file4",
+										Path: "file4",
 									},
 								},
 							},
 							{
 								File: &models.File{Name: "file5", ShortStatus: "M ", HasUnstagedChanges: true},
-								Name: "file5",
+								Path: "file5",
 							},
 						},
 					},
 					{
 						File: &models.File{Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true},
-						Name: "file1",
+						Path: "file1",
 					},
 				},
 			},
diff --git a/pkg/gui/status_tree.go b/pkg/gui/status_tree.go
index b7edf24e0..37de6c95e 100644
--- a/pkg/gui/status_tree.go
+++ b/pkg/gui/status_tree.go
@@ -35,7 +35,6 @@ func GetTreeFromStatusFiles(files []*models.File, log *logrus.Entry) *models.Sta
 			}
 
 			newChild := &models.StatusLineNode{
-				Name: path, // TODO: Remove concept of name
 				Path: path,
 				File: setFile,
 			}
@@ -55,7 +54,6 @@ func GetFlatTreeFromStatusFiles(files []*models.File) *models.StatusLineNode {
 	root := &models.StatusLineNode{}
 	for _, file := range files {
 		root.Children = append(root.Children, &models.StatusLineNode{
-			Name: file.GetPath(),
 			Path: file.GetPath(),
 			File: file,
 		})
-- 
cgit v1.2.3