mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-04-26 21:04:27 +02:00
Jesse Duffield
615c566ac4
Change working tree files and commit files panels to use filtering (reducing the list) instead of search (highlighting matches). This matches the behavior of other filterable views. The text filter matches against the full file path, not just the filename, which is more useful for navigating large directory trees. When toggling a directory for a custom patch while a text filter is active, only the visible filtered files in the directory are affected, consistent with how staging a directory in the files panel works. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
65 lines
1.7 KiB
Go
65 lines
1.7 KiB
Go
package patch_building
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var ToggleDirectory = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Toggle a directory for a custom patch",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateDir("dir1")
|
|
shell.CreateFileAndAdd("dir1/file1", "file1 content\n")
|
|
shell.CreateFileAndAdd("dir1/file2", "file2 content\n")
|
|
shell.CreateFileAndAdd("dir1/file3", "file3 content\n")
|
|
shell.CreateFileAndAdd("other-file", "other content\n")
|
|
shell.Commit("first commit")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("first commit").IsSelected(),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
Lines(
|
|
Equals("▼ /").IsSelected(),
|
|
Equals(" ▼ dir1"),
|
|
Equals(" A file1"),
|
|
Equals(" A file2"),
|
|
Equals(" A file3"),
|
|
Equals(" A other-file"),
|
|
).
|
|
NavigateToLine(Contains("dir1")).
|
|
PressPrimaryAction().
|
|
Lines(
|
|
Equals("▼ /"),
|
|
Equals(" ▼ dir1").IsSelected(),
|
|
Equals(" ● file1"),
|
|
Equals(" ● file2"),
|
|
Equals(" ● file3"),
|
|
Equals(" A other-file"),
|
|
)
|
|
|
|
t.Views().Information().Content(Contains("Building patch"))
|
|
|
|
// Toggle the directory again to remove all files from the patch
|
|
t.Views().CommitFiles().
|
|
PressPrimaryAction().
|
|
Lines(
|
|
Equals("▼ /"),
|
|
Equals(" ▼ dir1").IsSelected(),
|
|
Equals(" A file1"),
|
|
Equals(" A file2"),
|
|
Equals(" A file3"),
|
|
Equals(" A other-file"),
|
|
)
|
|
},
|
|
})
|