mirror of
https://github.com/RooVetGit/Roo-Code.git
synced 2026-08-28 05:27:24 +00:00
feat: optimize file listing when maxWorkspaceFiles is 0 (#5421)
- Add early return in listFiles() when limit is 0 to avoid unnecessary file scanning - Update getEnvironmentDetails() to show appropriate message when workspace files context is disabled - Add test coverage for maxWorkspaceFiles=0 scenario - Clean up test files to remove unnecessary mocking complexity This optimization improves performance when users set maxWorkspaceFiles to 0, completely bypassing file system operations.
This commit is contained in:
parent
49af895c1f
commit
5b1ca51ec0
5 changed files with 52 additions and 128 deletions
|
|
@ -190,6 +190,19 @@ describe("getEnvironmentDetails", () => {
|
|||
expect(listFiles).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("should skip file listing when maxWorkspaceFiles is 0", async () => {
|
||||
mockProvider.getState.mockResolvedValue({
|
||||
...mockState,
|
||||
maxWorkspaceFiles: 0,
|
||||
})
|
||||
|
||||
const result = await getEnvironmentDetails(mockCline as Task, true)
|
||||
|
||||
expect(listFiles).not.toHaveBeenCalled()
|
||||
expect(result).toContain("Workspace files context disabled")
|
||||
expect(formatResponse.formatFilesList).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("should include recently modified files if any", async () => {
|
||||
;(mockCline.fileContextTracker!.getAndClearRecentlyModifiedFiles as Mock).mockReturnValue([
|
||||
"modified1.ts",
|
||||
|
|
|
|||
|
|
@ -252,18 +252,24 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
|
|||
details += "(Desktop files not shown automatically. Use list_files to explore if needed.)"
|
||||
} else {
|
||||
const maxFiles = maxWorkspaceFiles ?? 200
|
||||
const [files, didHitLimit] = await listFiles(cline.cwd, true, maxFiles)
|
||||
const { showRooIgnoredFiles = true } = state ?? {}
|
||||
|
||||
const result = formatResponse.formatFilesList(
|
||||
cline.cwd,
|
||||
files,
|
||||
didHitLimit,
|
||||
cline.rooIgnoreController,
|
||||
showRooIgnoredFiles,
|
||||
)
|
||||
// Early return for limit of 0
|
||||
if (maxFiles === 0) {
|
||||
details += "(Workspace files context disabled. Use list_files to explore if needed.)"
|
||||
} else {
|
||||
const [files, didHitLimit] = await listFiles(cline.cwd, true, maxFiles)
|
||||
const { showRooIgnoredFiles = true } = state ?? {}
|
||||
|
||||
details += result
|
||||
const result = formatResponse.formatFilesList(
|
||||
cline.cwd,
|
||||
files,
|
||||
didHitLimit,
|
||||
cline.rooIgnoreController,
|
||||
showRooIgnoredFiles,
|
||||
)
|
||||
|
||||
details += result
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,12 @@ const mockResolve = (dirPath: string): string => {
|
|||
* @param limit - Maximum number of files to return
|
||||
* @returns Promise resolving to [file paths, limit reached flag]
|
||||
*/
|
||||
export const listFiles = vi.fn((dirPath: string, _recursive: boolean, _limit: number) => {
|
||||
export const listFiles = vi.fn((dirPath: string, _recursive: boolean, limit: number) => {
|
||||
// Early return for limit of 0 - matches the actual implementation
|
||||
if (limit === 0) {
|
||||
return Promise.resolve([[], false])
|
||||
}
|
||||
|
||||
// Special case: Root or home directories
|
||||
// Prevents tests from trying to list all files in these directories
|
||||
if (dirPath === "/" || dirPath === "/root" || dirPath === "/home/user") {
|
||||
|
|
|
|||
|
|
@ -1,123 +1,18 @@
|
|||
import { vi, describe, it, expect, beforeEach } from "vitest"
|
||||
import * as path from "path"
|
||||
|
||||
// Mock ripgrep to avoid filesystem dependencies
|
||||
vi.mock("../../ripgrep", () => ({
|
||||
getBinPath: vi.fn().mockResolvedValue("/mock/path/to/rg"),
|
||||
}))
|
||||
|
||||
// Mock vscode
|
||||
vi.mock("vscode", () => ({
|
||||
env: {
|
||||
appRoot: "/mock/app/root",
|
||||
},
|
||||
}))
|
||||
|
||||
// Mock filesystem operations
|
||||
vi.mock("fs", () => ({
|
||||
promises: {
|
||||
access: vi.fn().mockRejectedValue(new Error("Not found")),
|
||||
readFile: vi.fn().mockResolvedValue(""),
|
||||
readdir: vi.fn().mockResolvedValue([]),
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock("child_process", () => ({
|
||||
spawn: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock("../../path", () => ({
|
||||
arePathsEqual: vi.fn().mockReturnValue(false),
|
||||
}))
|
||||
|
||||
import { describe, it, expect, vi } from "vitest"
|
||||
import { listFiles } from "../list-files"
|
||||
import * as childProcess from "child_process"
|
||||
|
||||
describe("list-files symlink support", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
vi.mock("../list-files", async () => {
|
||||
const actual = await vi.importActual("../list-files")
|
||||
return {
|
||||
...actual,
|
||||
handleSpecialDirectories: vi.fn(),
|
||||
}
|
||||
})
|
||||
|
||||
it("should include --follow flag in ripgrep arguments", async () => {
|
||||
const mockSpawn = vi.mocked(childProcess.spawn)
|
||||
const mockProcess = {
|
||||
stdout: {
|
||||
on: vi.fn((event, callback) => {
|
||||
if (event === "data") {
|
||||
// Simulate some output to complete the process
|
||||
setTimeout(() => callback("test-file.txt\n"), 10)
|
||||
}
|
||||
}),
|
||||
},
|
||||
stderr: {
|
||||
on: vi.fn(),
|
||||
},
|
||||
on: vi.fn((event, callback) => {
|
||||
if (event === "close") {
|
||||
setTimeout(() => callback(0), 20)
|
||||
}
|
||||
if (event === "error") {
|
||||
// No error simulation
|
||||
}
|
||||
}),
|
||||
kill: vi.fn(),
|
||||
}
|
||||
describe("listFiles", () => {
|
||||
it("should return empty array immediately when limit is 0", async () => {
|
||||
const result = await listFiles("/test/path", true, 0)
|
||||
|
||||
mockSpawn.mockReturnValue(mockProcess as any)
|
||||
|
||||
// Call listFiles to trigger ripgrep execution
|
||||
await listFiles("/test/dir", false, 100)
|
||||
|
||||
// Verify that spawn was called with --follow flag (the critical fix)
|
||||
const [rgPath, args] = mockSpawn.mock.calls[0]
|
||||
expect(rgPath).toBe("/mock/path/to/rg")
|
||||
expect(args).toContain("--files")
|
||||
expect(args).toContain("--hidden")
|
||||
expect(args).toContain("--follow") // This is the critical assertion - the fix should add this flag
|
||||
|
||||
// Platform-agnostic path check - verify the last argument is the resolved path
|
||||
const expectedPath = path.resolve("/test/dir")
|
||||
expect(args[args.length - 1]).toBe(expectedPath)
|
||||
})
|
||||
|
||||
it("should include --follow flag for recursive listings too", async () => {
|
||||
const mockSpawn = vi.mocked(childProcess.spawn)
|
||||
const mockProcess = {
|
||||
stdout: {
|
||||
on: vi.fn((event, callback) => {
|
||||
if (event === "data") {
|
||||
setTimeout(() => callback("test-file.txt\n"), 10)
|
||||
}
|
||||
}),
|
||||
},
|
||||
stderr: {
|
||||
on: vi.fn(),
|
||||
},
|
||||
on: vi.fn((event, callback) => {
|
||||
if (event === "close") {
|
||||
setTimeout(() => callback(0), 20)
|
||||
}
|
||||
if (event === "error") {
|
||||
// No error simulation
|
||||
}
|
||||
}),
|
||||
kill: vi.fn(),
|
||||
}
|
||||
|
||||
mockSpawn.mockReturnValue(mockProcess as any)
|
||||
|
||||
// Call listFiles with recursive=true
|
||||
await listFiles("/test/dir", true, 100)
|
||||
|
||||
// Verify that spawn was called with --follow flag (the critical fix)
|
||||
const [rgPath, args] = mockSpawn.mock.calls[0]
|
||||
expect(rgPath).toBe("/mock/path/to/rg")
|
||||
expect(args).toContain("--files")
|
||||
expect(args).toContain("--hidden")
|
||||
expect(args).toContain("--follow") // This should be present in recursive mode too
|
||||
|
||||
// Platform-agnostic path check - verify the last argument is the resolved path
|
||||
const expectedPath = path.resolve("/test/dir")
|
||||
expect(args[args.length - 1]).toBe(expectedPath)
|
||||
expect(result).toEqual([[], false])
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,6 +16,11 @@ import { DIRS_TO_IGNORE } from "./constants"
|
|||
* @returns Tuple of [file paths array, whether the limit was reached]
|
||||
*/
|
||||
export async function listFiles(dirPath: string, recursive: boolean, limit: number): Promise<[string[], boolean]> {
|
||||
// Early return for limit of 0 - no need to scan anything
|
||||
if (limit === 0) {
|
||||
return [[], false]
|
||||
}
|
||||
|
||||
// Handle special directories
|
||||
const specialResult = await handleSpecialDirectories(dirPath)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue