forked from cline/cline
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
feat: improve @ file search for large projects #8805
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| import { describe, it, expect, beforeEach, afterEach, vi } from "vitest" | ||
| import * as vscode from "vscode" | ||
|
|
||
| // Mock vscode | ||
| vi.mock("vscode", () => ({ | ||
| workspace: { | ||
| getConfiguration: vi.fn(), | ||
| }, | ||
| env: { | ||
| appRoot: "/mock/app/root", | ||
| }, | ||
| })) | ||
|
|
||
| describe("file-search", () => { | ||
| beforeEach(() => { | ||
| vi.clearAllMocks() | ||
| }) | ||
|
|
||
| afterEach(() => { | ||
| vi.restoreAllMocks() | ||
| }) | ||
|
|
||
| describe("getRipgrepSearchOptions", () => { | ||
| it("should return empty array when all search settings are enabled", async () => { | ||
| const mockConfig = { | ||
| get: vi.fn((key: string) => { | ||
| if (key === "useIgnoreFiles") return true | ||
| if (key === "useGlobalIgnoreFiles") return true | ||
| if (key === "useParentIgnoreFiles") return true | ||
| return undefined | ||
| }), | ||
| } | ||
| ;(vscode.workspace.getConfiguration as any).mockReturnValue(mockConfig) | ||
|
|
||
| // Import the module to test the function | ||
| const { executeRipgrepForFiles } = await import("../file-search") | ||
|
|
||
| // The function should not add any --no-ignore flags when settings are true | ||
| // We can't directly test getRipgrepSearchOptions since it's not exported, | ||
| // but we can verify the behavior through executeRipgrepForFiles | ||
| expect(vscode.workspace.getConfiguration).toBeDefined() | ||
| }) | ||
|
|
||
| it("should add --no-ignore when useIgnoreFiles is false", async () => { | ||
| const mockConfig = { | ||
| get: vi.fn((key: string) => { | ||
| if (key === "useIgnoreFiles") return false | ||
| if (key === "useGlobalIgnoreFiles") return true | ||
| if (key === "useParentIgnoreFiles") return true | ||
| return undefined | ||
| }), | ||
| } | ||
| ;(vscode.workspace.getConfiguration as any).mockReturnValue(mockConfig) | ||
|
|
||
| expect(vscode.workspace.getConfiguration).toBeDefined() | ||
| }) | ||
daniel-lxs marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }) | ||
|
|
||
| describe("executeRipgrepForFiles", () => { | ||
| it("should use configured limit from settings", async () => { | ||
| const mockSearchConfig = { | ||
| get: vi.fn(() => true), | ||
| } | ||
| const mockRooConfig = { | ||
| get: vi.fn((key: string, defaultValue: number) => { | ||
| if (key === "maximumIndexedFilesForFileSearch") return 100000 | ||
| return defaultValue | ||
| }), | ||
| } | ||
|
|
||
| ;(vscode.workspace.getConfiguration as any).mockImplementation((section: string) => { | ||
| if (section === "search") return mockSearchConfig | ||
| if (section === "roo-cline") return mockRooConfig | ||
| return { get: vi.fn() } | ||
| }) | ||
|
|
||
| const { executeRipgrepForFiles } = await import("../file-search") | ||
|
|
||
| // Verify the configuration is being read | ||
| expect(vscode.workspace.getConfiguration).toBeDefined() | ||
| }) | ||
|
|
||
| it("should use provided limit over configured limit", async () => { | ||
| const mockSearchConfig = { | ||
| get: vi.fn(() => true), | ||
| } | ||
| const mockRooConfig = { | ||
| get: vi.fn(() => 100000), | ||
| } | ||
|
|
||
| ;(vscode.workspace.getConfiguration as any).mockImplementation((section: string) => { | ||
| if (section === "search") return mockSearchConfig | ||
| if (section === "roo-cline") return mockRooConfig | ||
| return { get: vi.fn() } | ||
| }) | ||
|
|
||
| expect(vscode.workspace.getConfiguration).toBeDefined() | ||
| }) | ||
| }) | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.