Files
Stefan Haller b8d23dd5a5 Make file sort order and case sensitivity configurable
Set the sort order's default from the former foldersFirst to mixed, so this is a
change in behavior. I find this useful because it now matches git's order, so if
you look at the diff of a commit, the TOC at the top has the same order as the
file tree you see when entering the commit.
2026-03-30 17:53:25 +02:00

191 lines
4.2 KiB
Go

package filetree
import (
"sort"
"strings"
"github.com/jesseduffield/lazygit/pkg/commands/models"
)
func BuildTreeFromFiles(
files []*models.File,
showRootItem bool,
cmp func(a, b *Node[models.File]) int,
) *Node[models.File] {
root := &Node[models.File]{}
childrenMapsByNode := make(map[*Node[models.File]]map[string]*Node[models.File])
var curr *Node[models.File]
for _, file := range files {
splitPath := SplitFileTreePath(file.Path, showRootItem)
curr = root
outer:
for i := range splitPath {
var setFile *models.File
isFile := i == len(splitPath)-1
if isFile {
setFile = file
}
path := join(splitPath[:i+1])
var currNodeChildrenMap map[string]*Node[models.File]
var isCurrNodeMapped bool
if currNodeChildrenMap, isCurrNodeMapped = childrenMapsByNode[curr]; !isCurrNodeMapped {
currNodeChildrenMap = make(map[string]*Node[models.File])
childrenMapsByNode[curr] = currNodeChildrenMap
}
child, doesCurrNodeHaveChildAlready := currNodeChildrenMap[path]
if doesCurrNodeHaveChildAlready {
curr = child
continue outer
}
if i == 0 && len(files) == 1 && len(splitPath) == 2 {
// skip the root item when there's only one file at top level; we don't need it in that case
continue outer
}
newChild := &Node[models.File]{
path: path,
File: setFile,
}
curr.Children = append(curr.Children, newChild)
currNodeChildrenMap[path] = newChild
curr = newChild
}
}
root.Sort(cmp)
root.Compress()
return root
}
func BuildFlatTreeFromCommitFiles(
files []*models.CommitFile,
showRootItem bool,
cmp func(a, b *Node[models.CommitFile]) int,
) *Node[models.CommitFile] {
rootAux := BuildTreeFromCommitFiles(files, showRootItem, cmp)
sortedFiles := rootAux.GetLeaves()
return &Node[models.CommitFile]{Children: sortedFiles}
}
func BuildTreeFromCommitFiles(
files []*models.CommitFile,
showRootItem bool,
cmp func(a, b *Node[models.CommitFile]) int,
) *Node[models.CommitFile] {
root := &Node[models.CommitFile]{}
var curr *Node[models.CommitFile]
for _, file := range files {
splitPath := SplitFileTreePath(file.Path, showRootItem)
curr = root
outer:
for i := range splitPath {
var setFile *models.CommitFile
isFile := i == len(splitPath)-1
if isFile {
setFile = file
}
path := join(splitPath[:i+1])
for _, existingChild := range curr.Children {
if existingChild.path == path {
curr = existingChild
continue outer
}
}
if i == 0 && len(files) == 1 && len(splitPath) == 2 {
// skip the root item when there's only one file at top level; we don't need it in that case
continue outer
}
newChild := &Node[models.CommitFile]{
path: path,
File: setFile,
}
curr.Children = append(curr.Children, newChild)
curr = newChild
}
}
root.Sort(cmp)
root.Compress()
return root
}
func BuildFlatTreeFromFiles(
files []*models.File,
showRootItem bool,
cmp func(a, b *Node[models.File]) int,
) *Node[models.File] {
rootAux := BuildTreeFromFiles(files, showRootItem, cmp)
sortedFiles := rootAux.GetLeaves()
// from top down we have merge conflict files, then tracked file, then untracked
// files. This is the one way in which sorting differs between flat mode and
// tree mode
sort.SliceStable(sortedFiles, func(i, j int) bool {
iFile := sortedFiles[i].File
jFile := sortedFiles[j].File
// never going to happen but just to be safe
if iFile == nil || jFile == nil {
return false
}
if iFile.HasMergeConflicts && !jFile.HasMergeConflicts {
return true
}
if jFile.HasMergeConflicts && !iFile.HasMergeConflicts {
return false
}
if iFile.Tracked && !jFile.Tracked {
return true
}
if jFile.Tracked && !iFile.Tracked {
return false
}
return false
})
return &Node[models.File]{Children: sortedFiles}
}
func split(str string) []string {
return strings.Split(str, "/")
}
func join(strs []string) string {
return strings.Join(strs, "/")
}
func SplitFileTreePath(path string, showRootItem bool) []string {
return split(InternalTreePathForFilePath(path, showRootItem))
}
func InternalTreePathForFilePath(path string, showRootItem bool) string {
if showRootItem {
return "./" + path
}
return path
}