[EVAL] Fix/issue 7921 search files includes files ignored by nested gitignore #46
Conversation
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
…and integrate with RooIgnoreController, Task, searchFilesTool; add tests; ripgrep formatting fix
![roo-code-dan[bot]](https://avatars.githubusercontent.com/u/211522643?s=60&v=4){kind=small}
|
|
||
| if (relativeDir) { | ||
| // For nested .gitignore files, we need to create patterns that match files within that directory | ||
| const lines = content.split(/\r?\n/).filter((line) => line.trim() && !line.startsWith("#")) |
There was a problem hiding this comment.
The filter !line.startsWith("#") incorrectly removes escaped literal patterns like \#foo which should match files literally named #foo. The ignore library handles escaped patterns correctly, but this pre-filter prevents them from reaching it. The test at line 308 ("should treat \# as a literal # pattern in nested .gitignore (exposes bug in line 136)") documents this exact issue.
Consider using !line.trim().startsWith("#") or checking for the escape sequence: !(line.startsWith("#") && !line.startsWith("\\#"))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
🧪 Evaluation PR for Testing
This is an automated test PR created for evaluation purposes.
This fixes a path resolution bug in the ripgrep search results formatting.
The issue was that path.relative() was being called on paths that might already be relative, which could cause incorrect path resolution. The fix checks if the path is absolute before calling path.relative(), otherwise uses it as-is.
Changes:
Note: This PR excludes the upstream test file that relies on GitIgnoreController (which doesn't exist in this fork - we use RooIgnoreController instead). The core bug fix remains applicable.