scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-10-10 03:28:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix path normalization for RooIgnoreController and tests

Browse source
This commit is contained in:
j-east 2025-10-02 21:30:39 -04:00
parent 1ea63afea3
commit 80ea42d814
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/core/ignore/GitIgnoreController.ts
View file

@ -123,28 +123,38 @@ export class GitIgnoreController extends BaseIgnoreController {
if (relativeDir) {
// For nested .gitignore files, we need to create patterns that match files within that directory
const lines = content.split("\n").filter((line) => line.trim() && !line.startsWith("#"))
const adjustedPatterns = lines.map((pattern) => {
const lines = content.split(/\r?\n/).filter((line) => line.trim() && !line.startsWith("#"))
// Convert Windows paths to POSIX for consistent pattern matching
const normalizedRelativeDir = relativeDir.split(path.sep).join("/")
const adjustedPatterns = lines.flatMap((pattern) => {
const trimmed = pattern.trim()
// Convert Windows paths to POSIX for consistent pattern matching
const normalizedRelativeDir = relativeDir.split(path.sep).join("/")
if (trimmed.startsWith("/")) {
// Absolute patterns (starting with /) are relative to the .gitignore location
return normalizedRelativeDir + trimmed
return [normalizedRelativeDir + trimmed]
} else if (trimmed.startsWith("!")) {
// Negation patterns
const negatedPattern = trimmed.slice(1)
if (negatedPattern.startsWith("/")) {
return "!" + normalizedRelativeDir + negatedPattern
return ["!" + normalizedRelativeDir + negatedPattern]
} else {
// For relative negation patterns, match in the directory and subdirectories
return "!" + normalizedRelativeDir + "/" + negatedPattern
return [
"!" + normalizedRelativeDir + "/" + negatedPattern,
"!" + normalizedRelativeDir + "/**/" + negatedPattern,
]
}
} else {
// Relative patterns - match files directly in the directory
// This handles cases like "*.tmp" in src/.gitignore matching "src/temp.tmp"
return normalizedRelativeDir + "/" + trimmed
// Relative patterns - match files in the directory and all subdirectories
// For "*.tmp" in src/.gitignore, we need TWO patterns:
// - src/*.tmp (matches direct children like src/temp.tmp)
// - src/**/*.tmp (matches descendants like src/subdir/temp.tmp)
const patterns = [
normalizedRelativeDir + "/" + trimmed,
normalizedRelativeDir + "/**/" + trimmed,
]
return patterns
}
})

4
src/core/ignore/__tests__/GitIgnoreController.security.spec.ts
View file

@ -175,7 +175,9 @@ build/
// Mock different content for each file
mockReadFile.mockImplementation((filePath: any) => {
if (filePath.toString().endsWith("src/.gitignore")) {
// Normalize path separators for cross-platform compatibility
const normalizedPath = filePath.toString().replace(/\\/g, "/")
if (normalizedPath.endsWith("src/.gitignore")) {
return Promise.resolve("*.tmp\n*.cache\n")
}
return Promise.resolve("node_modules/\n*.log\n")

4
src/core/ignore/__tests__/GitIgnoreController.spec.ts
View file

@ -153,7 +153,9 @@ describe("GitIgnoreController", () => {
// Mock different content for each file
mockReadFile.mockImplementation((filePath: any) => {
if (filePath.toString().endsWith("src/.gitignore")) {
// Normalize path separators for cross-platform compatibility
const normalizedPath = filePath.toString().replace(/\\/g, "/")
if (normalizedPath.endsWith("src/.gitignore")) {
return Promise.resolve("*.tmp\n")
}
return Promise.resolve("node_modules/\n*.log\n")