diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-21 15:25:29 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-30 21:57:00 +1100 |
| commit | e52cec9cdf17ffb27fc3521f9abd977603d31753 (patch) | |
| tree | 698accb07b84f898d2b18321067c0c9a29f7f61e | |
| parent | 5bb48b51a014a5d794a719c3879af88d45905210 (diff) | |
small refactor
| -rw-r--r-- | pkg/gui/filetree/build_tree.go (renamed from pkg/gui/status_tree.go) | 8 | ||||
| -rw-r--r-- | pkg/gui/filetree/file_change_manager.go (renamed from pkg/gui/file_change_manager.go) | 6 | ||||
| -rw-r--r-- | pkg/gui/filetree/file_change_manager_test.go (renamed from pkg/gui/file_change_manager_test.go) | 2 | ||||
| -rw-r--r-- | pkg/gui/gui.go | 5 |
4 files changed, 11 insertions, 10 deletions
diff --git a/pkg/gui/status_tree.go b/pkg/gui/filetree/build_tree.go index 3e201b7d4..e8da844e0 100644 --- a/pkg/gui/status_tree.go +++ b/pkg/gui/filetree/build_tree.go @@ -1,4 +1,4 @@ -package gui +package filetree import ( "os" @@ -9,7 +9,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/models" ) -func GetTreeFromFiles(files []*models.File) *models.FileChangeNode { +func BuildTreeFromFiles(files []*models.File) *models.FileChangeNode { root := &models.FileChangeNode{} var curr *models.FileChangeNode @@ -49,8 +49,8 @@ func GetTreeFromFiles(files []*models.File) *models.FileChangeNode { return root } -func GetFlatTreeFromFiles(files []*models.File) *models.FileChangeNode { - rootAux := GetTreeFromFiles(files) +func BuildFlatTreeFromFiles(files []*models.File) *models.FileChangeNode { + rootAux := BuildTreeFromFiles(files) sortedFiles := rootAux.GetLeaves() // Move merge conflicts to top. This is the one way in which sorting diff --git a/pkg/gui/file_change_manager.go b/pkg/gui/filetree/file_change_manager.go index 1af1fb748..925398827 100644 --- a/pkg/gui/file_change_manager.go +++ b/pkg/gui/filetree/file_change_manager.go @@ -1,4 +1,4 @@ -package gui +package filetree import ( "fmt" @@ -63,9 +63,9 @@ func (m *FileChangeManager) SetFiles(files []*models.File) { func (m *FileChangeManager) SetTree() { if m.ShowTree { - m.Tree = GetTreeFromFiles(m.Files) + m.Tree = BuildTreeFromFiles(m.Files) } else { - m.Tree = GetFlatTreeFromFiles(m.Files) + m.Tree = BuildFlatTreeFromFiles(m.Files) } } diff --git a/pkg/gui/file_change_manager_test.go b/pkg/gui/filetree/file_change_manager_test.go index f339aae0f..8e8ba00cd 100644 --- a/pkg/gui/file_change_manager_test.go +++ b/pkg/gui/filetree/file_change_manager_test.go @@ -1,4 +1,4 @@ -package gui +package filetree import ( "testing" diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index b36ab14db..fbb2ab223 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -21,6 +21,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/commands/patch" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gui/filetree" "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/tasks" @@ -303,7 +304,7 @@ type guiStateMutexes struct { } type guiState struct { - FileChangeManager *FileChangeManager + FileChangeManager *filetree.FileChangeManager Submodules []*models.SubmoduleConfig Branches []*models.Branch Commits []*models.Commit @@ -380,7 +381,7 @@ func (gui *Gui) resetState() { showTree := gui.Config.GetUserConfig().Gui.ShowFileTree gui.State = &guiState{ - FileChangeManager: NewFileChangeManager(make([]*models.File, 0), gui.Log, showTree), + FileChangeManager: filetree.NewFileChangeManager(make([]*models.File, 0), gui.Log, showTree), Commits: make([]*models.Commit, 0), FilteredReflogCommits: make([]*models.Commit, 0), ReflogCommits: make([]*models.Commit, 0), |