mirror of
https://github.com/patriceckhart/zot.git
synced 2026-06-26 21:36:31 +02:00
The recursive @-picker only read the repo's root .gitignore, so a nested .gitignore (e.g. .opencode/.gitignore ignoring its own node_modules) was invisible. WalkDir visits lexically, so a dot-prefixed vendored tree got walked first and its node_modules flooded the 5000-entry budget before the walk ever reached deeply nested source files. The picker then fuzzy-matched against junk and never surfaced the real target. - Add ignore.Stack: a per-directory .gitignore chain pushed/popped as the recursive walk descends, with git-style nearest-file-wins semantics including nested negations. scanRecursive now prunes nested-ignored trees like node_modules. - Raise maxRecursiveEntries 5000 -> 50000 and maxRecursiveDepth 12 -> 24. The bottleneck is per-keystroke fuzzy.Find, not memory: a fileEntry is ~120 bytes (~6 MB at 50k), and benchmarked fuzzy.Find latency is ~2ms @ 5k, ~13ms @ 50k, ~21ms @ 100k, so 50k keeps ranking under one 60Hz frame while holding a large monorepo once nested-gitignore pruning has done its job. Verified against the reporting monorepo: the fully-pruned tree is 4397 entries (node_modules=0), scan ~360ms once (cached after), match ~2.5ms per keystroke, and @pipeline.py now finds eda/rjg/enk-1150/pipeline.py. Adds regression tests at both the ignore.Stack layer and the file_suggest layer, including a repro of the nested-node_modules + deep-file scenario.
130 lines
4.2 KiB
Go
130 lines
4.2 KiB
Go
package ignore
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
)
|
|
|
|
func TestParseAndMatch(t *testing.T) {
|
|
g := Parse(lines("# comment", "", ".terraform/", ".terragrunt-cache/", "node_modules/", "*.log", "/build", "!keep.log"))
|
|
|
|
cases := []struct {
|
|
rel string
|
|
isDir bool
|
|
want bool
|
|
}{
|
|
{".terraform", true, true},
|
|
// A dirOnly rule matches the directory itself; the walk prunes
|
|
// descent on that match, so children are never tested. A file
|
|
// path under it is therefore not matched directly by the rule.
|
|
{".terraform/providers/x", false, false},
|
|
{".terragrunt-cache", true, true},
|
|
{"modules/.terragrunt-cache", true, true},
|
|
{"node_modules", true, true},
|
|
{"src/node_modules/pkg", true, true},
|
|
{"debug.log", false, true},
|
|
{"keep.log", false, false}, // re-included by negation
|
|
{"build", true, true}, // anchored
|
|
{"sub/build", true, false}, // anchored: only at root
|
|
{"main.tf", false, false},
|
|
{"src/app.go", false, false},
|
|
}
|
|
for _, c := range cases {
|
|
if got := g.Match(c.rel, c.isDir); got != c.want {
|
|
t.Errorf("Match(%q, dir=%v) = %v, want %v", c.rel, c.isDir, got, c.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestEmptyIgnoresNothing(t *testing.T) {
|
|
g := Parse("")
|
|
if g.Match("anything", false) || g.Match("dir", true) {
|
|
t.Fatal("empty matcher should ignore nothing")
|
|
}
|
|
}
|
|
|
|
// TestStackHonorsNestedGitignore pins the recursive-picker bug: a
|
|
// .gitignore living inside a subdirectory (here .opencode/.gitignore
|
|
// ignoring node_modules, exactly the layout that flooded the @-picker)
|
|
// must prune that subdirectory's node_modules even though the root
|
|
// .gitignore says nothing about it.
|
|
func TestStackHonorsNestedGitignore(t *testing.T) {
|
|
root := t.TempDir()
|
|
// Root .gitignore: only build/ at root, nothing about node_modules.
|
|
if err := os.WriteFile(filepath.Join(root, ".gitignore"), []byte("build/\n"), 0o644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
opencode := filepath.Join(root, ".opencode")
|
|
if err := os.MkdirAll(opencode, 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(opencode, ".gitignore"), []byte("node_modules\n"), 0o644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
s := NewStack(root)
|
|
// Before descending into .opencode the nested rule is not in scope,
|
|
// so a same-named path elsewhere stays visible.
|
|
if s.Match("node_modules", true) {
|
|
t.Fatal("root-level node_modules should not be ignored by an unloaded nested rule")
|
|
}
|
|
// Descend into .opencode: push its .gitignore.
|
|
s.Push(opencode, ".opencode")
|
|
if !s.Match(".opencode/node_modules", true) {
|
|
t.Fatal("nested .opencode/.gitignore should ignore .opencode/node_modules")
|
|
}
|
|
if !s.Match(".opencode/node_modules/zod/src/v3/tests/pipeline.test.ts", false) {
|
|
t.Fatal("files under nested-ignored node_modules should be ignored")
|
|
}
|
|
// A sibling source file inside .opencode is still visible.
|
|
if s.Match(".opencode/config.json", false) {
|
|
t.Fatal(".opencode/config.json should not be ignored")
|
|
}
|
|
// Root build/ rule still applies through the stack.
|
|
if !s.Match("build", true) {
|
|
t.Fatal("root build/ rule should still apply while nested frame is pushed")
|
|
}
|
|
// Pop the nested frame: its rule no longer applies.
|
|
s.Pop()
|
|
if s.Match(".opencode/node_modules", true) {
|
|
t.Fatal("after popping, the nested rule should no longer be in scope")
|
|
}
|
|
}
|
|
|
|
// TestStackNestedNegationReincludes verifies a nested !pattern can
|
|
// re-include a path a parent .gitignore excluded.
|
|
func TestStackNestedNegationReincludes(t *testing.T) {
|
|
root := t.TempDir()
|
|
if err := os.WriteFile(filepath.Join(root, ".gitignore"), []byte("*.log\n"), 0o644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
sub := filepath.Join(root, "sub")
|
|
if err := os.MkdirAll(sub, 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(sub, ".gitignore"), []byte("!keep.log\n"), 0o644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
s := NewStack(root)
|
|
s.Push(sub, "sub")
|
|
if s.Match("sub/keep.log", false) {
|
|
t.Fatal("nested !keep.log should re-include a *.log excluded by root")
|
|
}
|
|
if !s.Match("sub/other.log", false) {
|
|
t.Fatal("sub/other.log should still be excluded by root *.log")
|
|
}
|
|
}
|
|
|
|
// lines joins fixture lines with newlines for readable .gitignore
|
|
// fixtures.
|
|
func lines(ls ...string) string {
|
|
out := ""
|
|
for i, l := range ls {
|
|
if i > 0 {
|
|
out += "\n"
|
|
}
|
|
out += l
|
|
}
|
|
return out
|
|
}
|