mirror of
https://github.com/RooVetGit/Roo-Code.git
synced 2026-08-28 05:27:24 +00:00
fix: prevent listFilesRecursive from excluding projects under /tmp directory
- Changed ripgrep exclusion patterns from !**/${dir}/** to !**/${dir}/ to only exclude directories with the specified name, not paths containing the name
- This fixes the issue where projects under /tmp were having all their files excluded because "tmp" appeared in the parent path
- Added comprehensive test cases to verify the fix works correctly
- Ensures that nested tmp directories are still properly excluded while allowing projects under /tmp to work
Fixes #6545
This commit is contained in:
Roo Code
parent
836371c36a
commit
60fbd5db2a
2 changed files with 238 additions and 5 deletions
232
src/services/glob/__tests__/list-files-tmp-directory.spec.ts
Normal file
232
src/services/glob/__tests__/list-files-tmp-directory.spec.ts
Normal file
|
|
@ -0,0 +1,232 @@
|
|||
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"
|
||||
import * as path from "path"
|
||||
import { listFiles } from "../list-files"
|
||||
import * as childProcess from "child_process"
|
||||
import * as fs from "fs"
|
||||
|
||||
// Mock child_process.spawn
|
||||
vi.mock("child_process", () => ({
|
||||
spawn: vi.fn(),
|
||||
}))
|
||||
|
||||
// Mock fs.promises.readdir
|
||||
vi.mock("fs", async () => {
|
||||
const actual = await vi.importActual<typeof import("fs")>("fs")
|
||||
return {
|
||||
...actual,
|
||||
promises: {
|
||||
...actual.promises,
|
||||
readdir: vi.fn(),
|
||||
access: vi.fn(),
|
||||
readFile: vi.fn(),
|
||||
},
|
||||
}
|
||||
})
|
||||
|
||||
// Import getBinPath type for mocking
|
||||
import { getBinPath } from "../../../services/ripgrep"
|
||||
|
||||
// Mock getBinPath
|
||||
vi.mock("../../../services/ripgrep", () => ({
|
||||
getBinPath: vi.fn(),
|
||||
}))
|
||||
|
||||
// Mock vscode
|
||||
vi.mock("vscode", () => ({
|
||||
env: {
|
||||
appRoot: "/mock/app/root",
|
||||
},
|
||||
}))
|
||||
|
||||
describe("list-files with projects under /tmp directory", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
// Set up getBinPath mock
|
||||
vi.mocked(getBinPath).mockResolvedValue("/path/to/rg")
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
it("should list files in a project under /tmp directory", async () => {
|
||||
const mockSpawn = vi.mocked(childProcess.spawn)
|
||||
const mockProcess = {
|
||||
stdout: { on: vi.fn() },
|
||||
stderr: { on: vi.fn() },
|
||||
on: vi.fn(),
|
||||
kill: vi.fn(),
|
||||
}
|
||||
|
||||
mockSpawn.mockReturnValue(mockProcess as any)
|
||||
|
||||
// Simulate ripgrep output for files under /tmp/project
|
||||
mockProcess.stdout.on.mockImplementation((event, callback) => {
|
||||
if (event === "data") {
|
||||
// Simulate files that should be found in /tmp/project
|
||||
const files = ["a/b/c/a.js", "src/index.ts", "package.json", "README.md"].join("\n") + "\n"
|
||||
setTimeout(() => callback(files), 10)
|
||||
}
|
||||
})
|
||||
|
||||
mockProcess.on.mockImplementation((event, callback) => {
|
||||
if (event === "close") {
|
||||
setTimeout(() => callback(0), 20)
|
||||
}
|
||||
})
|
||||
|
||||
// Mock directory listing for /tmp/project
|
||||
const mockReaddir = vi.mocked(fs.promises.readdir)
|
||||
mockReaddir.mockImplementation(async (dirPath) => {
|
||||
const pathStr = dirPath.toString()
|
||||
if (pathStr === path.resolve("/tmp/project")) {
|
||||
return [
|
||||
{ name: "a", isDirectory: () => true, isSymbolicLink: () => false },
|
||||
{ name: "src", isDirectory: () => true, isSymbolicLink: () => false },
|
||||
{ name: "package.json", isDirectory: () => false, isSymbolicLink: () => false },
|
||||
{ name: "README.md", isDirectory: () => false, isSymbolicLink: () => false },
|
||||
] as any
|
||||
} else if (pathStr === path.resolve("/tmp/project/a")) {
|
||||
return [{ name: "b", isDirectory: () => true, isSymbolicLink: () => false }] as any
|
||||
} else if (pathStr === path.resolve("/tmp/project/a/b")) {
|
||||
return [{ name: "c", isDirectory: () => true, isSymbolicLink: () => false }] as any
|
||||
} else if (pathStr === path.resolve("/tmp/project/a/b/c")) {
|
||||
return [{ name: "a.js", isDirectory: () => false, isSymbolicLink: () => false }] as any
|
||||
}
|
||||
return []
|
||||
})
|
||||
|
||||
// Mock gitignore access (no .gitignore files)
|
||||
vi.mocked(fs.promises.access).mockRejectedValue(new Error("Not found"))
|
||||
|
||||
// Call listFiles targeting /tmp/project
|
||||
const [files, didHitLimit] = await listFiles("/tmp/project", true, 100)
|
||||
|
||||
// Verify ripgrep was called with correct arguments
|
||||
expect(mockSpawn).toHaveBeenCalledWith(
|
||||
"/path/to/rg",
|
||||
expect.arrayContaining([
|
||||
"--files",
|
||||
"--hidden",
|
||||
"--follow",
|
||||
"-g",
|
||||
"!**/node_modules/",
|
||||
"-g",
|
||||
"!**/__pycache__/",
|
||||
"-g",
|
||||
"!**/env/",
|
||||
"-g",
|
||||
"!**/venv/",
|
||||
"-g",
|
||||
"!**/target/dependency/",
|
||||
"-g",
|
||||
"!**/build/dependencies/",
|
||||
"-g",
|
||||
"!**/dist/",
|
||||
"-g",
|
||||
"!**/out/",
|
||||
"-g",
|
||||
"!**/bundle/",
|
||||
"-g",
|
||||
"!**/vendor/",
|
||||
"-g",
|
||||
"!**/tmp/", // This should exclude tmp directories, but not the parent /tmp
|
||||
"-g",
|
||||
"!**/temp/",
|
||||
"-g",
|
||||
"!**/deps/",
|
||||
"-g",
|
||||
"!**/pkg/",
|
||||
"-g",
|
||||
"!**/Pods/",
|
||||
"-g",
|
||||
"!**/.git/",
|
||||
"-g",
|
||||
"!**/.*/**", // Hidden directories pattern
|
||||
"/tmp/project",
|
||||
]),
|
||||
)
|
||||
|
||||
// Verify files were found
|
||||
expect(files).toContain(path.resolve("/tmp/project/a/b/c/a.js"))
|
||||
expect(files).toContain(path.resolve("/tmp/project/src/index.ts"))
|
||||
expect(files).toContain(path.resolve("/tmp/project/package.json"))
|
||||
expect(files).toContain(path.resolve("/tmp/project/README.md"))
|
||||
|
||||
// Verify directories were included
|
||||
expect(files).toContain(path.resolve("/tmp/project/a") + "/")
|
||||
expect(files).toContain(path.resolve("/tmp/project/a/b") + "/")
|
||||
expect(files).toContain(path.resolve("/tmp/project/a/b/c") + "/")
|
||||
expect(files).toContain(path.resolve("/tmp/project/src") + "/")
|
||||
|
||||
expect(didHitLimit).toBe(false)
|
||||
})
|
||||
|
||||
it("should exclude nested tmp directories within a project under /tmp", async () => {
|
||||
const mockSpawn = vi.mocked(childProcess.spawn)
|
||||
const mockProcess = {
|
||||
stdout: { on: vi.fn() },
|
||||
stderr: { on: vi.fn() },
|
||||
on: vi.fn(),
|
||||
kill: vi.fn(),
|
||||
}
|
||||
|
||||
mockSpawn.mockReturnValue(mockProcess as any)
|
||||
|
||||
// Simulate ripgrep output - should not include files from nested tmp directory
|
||||
mockProcess.stdout.on.mockImplementation((event, callback) => {
|
||||
if (event === "data") {
|
||||
const files =
|
||||
[
|
||||
"src/index.ts",
|
||||
"package.json",
|
||||
// Note: src/tmp/cache.js should NOT be included
|
||||
].join("\n") + "\n"
|
||||
setTimeout(() => callback(files), 10)
|
||||
}
|
||||
})
|
||||
|
||||
mockProcess.on.mockImplementation((event, callback) => {
|
||||
if (event === "close") {
|
||||
setTimeout(() => callback(0), 20)
|
||||
}
|
||||
})
|
||||
|
||||
// Mock directory listing
|
||||
const mockReaddir = vi.mocked(fs.promises.readdir)
|
||||
mockReaddir.mockImplementation(async (dirPath) => {
|
||||
const pathStr = dirPath.toString()
|
||||
if (pathStr === path.resolve("/tmp/myproject")) {
|
||||
return [
|
||||
{ name: "src", isDirectory: () => true, isSymbolicLink: () => false },
|
||||
{ name: "package.json", isDirectory: () => false, isSymbolicLink: () => false },
|
||||
] as any
|
||||
} else if (pathStr === path.resolve("/tmp/myproject/src")) {
|
||||
return [
|
||||
{ name: "index.ts", isDirectory: () => false, isSymbolicLink: () => false },
|
||||
{ name: "tmp", isDirectory: () => true, isSymbolicLink: () => false },
|
||||
] as any
|
||||
}
|
||||
return []
|
||||
})
|
||||
|
||||
// Mock gitignore access (no .gitignore files)
|
||||
vi.mocked(fs.promises.access).mockRejectedValue(new Error("Not found"))
|
||||
|
||||
// Call listFiles
|
||||
const [files, didHitLimit] = await listFiles("/tmp/myproject", true, 100)
|
||||
|
||||
// Verify files from root project are included
|
||||
expect(files).toContain(path.resolve("/tmp/myproject/src/index.ts"))
|
||||
expect(files).toContain(path.resolve("/tmp/myproject/package.json"))
|
||||
|
||||
// Verify nested tmp directory is NOT included
|
||||
expect(files).not.toContain(path.resolve("/tmp/myproject/src/tmp") + "/")
|
||||
|
||||
// Verify the exclusion pattern was applied correctly
|
||||
const spawnCall = mockSpawn.mock.calls[0]
|
||||
const args = spawnCall[1] as string[]
|
||||
expect(args).toContain("-g")
|
||||
expect(args).toContain("!**/tmp/")
|
||||
})
|
||||
})
|
||||
|
|
@ -281,8 +281,10 @@ function buildRecursiveArgs(dirPath: string): string[] {
|
|||
continue
|
||||
}
|
||||
|
||||
// For all other cases, exclude the directory pattern globally
|
||||
args.push("-g", `!**/${dir}/**`)
|
||||
// For all other cases, exclude directories with this name at any level
|
||||
// Use !**/${dir}/ to match directories only (with trailing slash)
|
||||
// This prevents excluding files when the parent path contains the directory name
|
||||
args.push("-g", `!**/${dir}/`)
|
||||
}
|
||||
|
||||
return args
|
||||
|
|
@ -310,9 +312,8 @@ function buildNonRecursiveArgs(): string[] {
|
|||
// We'll let the directory scanning logic handle the visibility.
|
||||
continue
|
||||
} else {
|
||||
// Direct children only
|
||||
args.push("-g", `!${dir}`)
|
||||
args.push("-g", `!${dir}/**`)
|
||||
// Direct children only - exclude directories with this name
|
||||
args.push("-g", `!${dir}/`)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue