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

small refactor

Browse Source
This commit is contained in:
Jesse Duffield 2021-03-21 15:25:29 +11:00
parent 5bb48b51a0
commit e52cec9cdf
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/status_tree.go → pkg/gui/filetree/build_tree.go
View File

@ -1,4 +1,4 @@
package gui package filetree
import ( import (
"os" "os"
@ -9,7 +9,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/models"
) )
func GetTreeFromFiles(files []*models.File) *models.FileChangeNode { func BuildTreeFromFiles(files []*models.File) *models.FileChangeNode {
root := &models.FileChangeNode{} root := &models.FileChangeNode{}
var curr *models.FileChangeNode var curr *models.FileChangeNode
@ -49,8 +49,8 @@ func GetTreeFromFiles(files []*models.File) *models.FileChangeNode {
return root return root
} }
func GetFlatTreeFromFiles(files []*models.File) *models.FileChangeNode { func BuildFlatTreeFromFiles(files []*models.File) *models.FileChangeNode {
rootAux := GetTreeFromFiles(files) rootAux := BuildTreeFromFiles(files)
sortedFiles := rootAux.GetLeaves() sortedFiles := rootAux.GetLeaves()
// Move merge conflicts to top. This is the one way in which sorting // Move merge conflicts to top. This is the one way in which sorting

6
pkg/gui/file_change_manager.go → pkg/gui/filetree/file_change_manager.go
View File

@ -1,4 +1,4 @@
package gui package filetree
import ( import (
"fmt" "fmt"
@ -63,9 +63,9 @@ func (m *FileChangeManager) SetFiles(files []*models.File) {
func (m *FileChangeManager) SetTree() { func (m *FileChangeManager) SetTree() {
if m.ShowTree { if m.ShowTree {
m.Tree = GetTreeFromFiles(m.Files) m.Tree = BuildTreeFromFiles(m.Files)
} else { } else {
m.Tree = GetFlatTreeFromFiles(m.Files) m.Tree = BuildFlatTreeFromFiles(m.Files)
} }
} }

2
pkg/gui/file_change_manager_test.go → pkg/gui/filetree/file_change_manager_test.go
View File

@ -1,4 +1,4 @@
package gui package filetree
import ( import (
"testing" "testing"

5
pkg/gui/gui.go
View File

@ -21,6 +21,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/commands/oscommands"
"github.com/jesseduffield/lazygit/pkg/commands/patch" "github.com/jesseduffield/lazygit/pkg/commands/patch"
"github.com/jesseduffield/lazygit/pkg/config" "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/gui/types"
"github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/i18n"
"github.com/jesseduffield/lazygit/pkg/tasks" "github.com/jesseduffield/lazygit/pkg/tasks"
@ -303,7 +304,7 @@ type guiStateMutexes struct {
} }
type guiState struct { type guiState struct {
FileChangeManager *FileChangeManager FileChangeManager *filetree.FileChangeManager
Submodules []*models.SubmoduleConfig Submodules []*models.SubmoduleConfig
Branches []*models.Branch Branches []*models.Branch
Commits []*models.Commit Commits []*models.Commit
@ -380,7 +381,7 @@ func (gui *Gui) resetState() {
showTree := gui.Config.GetUserConfig().Gui.ShowFileTree showTree := gui.Config.GetUserConfig().Gui.ShowFileTree
gui.State = &guiState{ 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), Commits: make([]*models.Commit, 0),
FilteredReflogCommits: make([]*models.Commit, 0), FilteredReflogCommits: make([]*models.Commit, 0),
ReflogCommits: make([]*models.Commit, 0), ReflogCommits: make([]*models.Commit, 0),