go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-10 22:42:00 +02:00
Code Issues Releases Activity

Lint

Browse Source
This commit is contained in:
Liberatys
2021-08-03 22:47:11 +02:00
committed by Jesse Duffield
parent 6b68f4f25d
commit 711bd5a670
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/files_panel.go
View File

@@ -474,7 +474,7 @@ func (gui *Gui) handleCommitEditorPress() error {
} }
func (gui *Gui) handleStatusFilterPressed() error { func (gui *Gui) handleStatusFilterPressed() error {
menuItems := []*menuItem{ menuItems := []*menuItem{
{ {
displayString: gui.Tr.FilterStagedFiles, displayString: gui.Tr.FilterStagedFiles,
onPress: func() error { onPress: func() error {
@@ -495,7 +495,7 @@ func (gui *Gui) handleStatusFilterPressed() error {
}, },
} }
return gui.createMenu(gui.Tr.FilteringMenuTitle, menuItems, createMenuOptions{showCancel: true }) return gui.createMenu(gui.Tr.FilteringMenuTitle, menuItems, createMenuOptions{showCancel: true})
} }
func (gui *Gui) setStatusFiltering(filter filetree.FileManagerDisplayFilter) error { func (gui *Gui) setStatusFiltering(filter filetree.FileManagerDisplayFilter) error {

32
pkg/gui/filetree/file_manager_test.go
View File

@@ -105,40 +105,40 @@ func TestFilterAction(t *testing.T) {
name: "filter files with unstaged changes", name: "filter files with unstaged changes",
filter: DisplayUnstaged, filter: DisplayUnstaged,
files: []*models.File{ files: []*models.File{
&models.File{Name: "dir2/dir2/file4", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "dir2/dir2/file4", ShortStatus: "M ", HasUnstagedChanges: true},
&models.File{Name: "dir2/file5", ShortStatus: "M ", HasStagedChanges: true}, {Name: "dir2/file5", ShortStatus: "M ", HasStagedChanges: true},
&models.File{Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true},
}, },
expected: []*models.File{ expected: []*models.File{
&models.File{Name: "dir2/dir2/file4", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "dir2/dir2/file4", ShortStatus: "M ", HasUnstagedChanges: true},
&models.File{Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true},
}, },
}, },
{ {
name: "filter files with staged changes", name: "filter files with staged changes",
filter: DisplayStaged, filter: DisplayStaged,
files: []*models.File{ files: []*models.File{
&models.File{Name: "dir2/dir2/file4", ShortStatus: "M ", HasStagedChanges: true}, {Name: "dir2/dir2/file4", ShortStatus: "M ", HasStagedChanges: true},
&models.File{Name: "dir2/file5", ShortStatus: "M ", HasStagedChanges: false}, {Name: "dir2/file5", ShortStatus: "M ", HasStagedChanges: false},
&models.File{Name: "file1", ShortStatus: "M ", HasStagedChanges: true}, {Name: "file1", ShortStatus: "M ", HasStagedChanges: true},
}, },
expected: []*models.File{ expected: []*models.File{
&models.File{Name: "dir2/dir2/file4", ShortStatus: "M ", HasStagedChanges: true}, {Name: "dir2/dir2/file4", ShortStatus: "M ", HasStagedChanges: true},
&models.File{Name: "file1", ShortStatus: "M ", HasStagedChanges: true}, {Name: "file1", ShortStatus: "M ", HasStagedChanges: true},
}, },
}, },
{ {
name: "filter all files", name: "filter all files",
filter: DisplayAll, filter: DisplayAll,
files: []*models.File{ files: []*models.File{
&models.File{Name: "dir2/dir2/file4", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "dir2/dir2/file4", ShortStatus: "M ", HasUnstagedChanges: true},
&models.File{Name: "dir2/file5", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "dir2/file5", ShortStatus: "M ", HasUnstagedChanges: true},
&models.File{Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true},
}, },
expected: []*models.File{ expected: []*models.File{
&models.File{Name: "dir2/dir2/file4", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "dir2/dir2/file4", ShortStatus: "M ", HasUnstagedChanges: true},
&models.File{Name: "dir2/file5", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "dir2/file5", ShortStatus: "M ", HasUnstagedChanges: true},
&models.File{Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true}, {Name: "file1", ShortStatus: "M ", HasUnstagedChanges: true},
}, },
}, },
} }