twin/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-05-19 09:40:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Properly match the rules "**/" and "!**/"

Browse Source 
When processing a rule that ends in a slash, we strip it off and set the
`is_only_dir` flag.  We then apply the rule that paths that aren't
absolute should be given an implicit `**/` prefix, while avoiding
adding that prefix if it already exists.

However, this means that we miss the case in which we had already
stripped off the trailing slash and set `is_only_dir`.  Correct this
by also explicitly checking for that case.

Fixes #649
This commit is contained in:
Brian Campbell 2017-10-23 22:52:01 -04:00 committed by Andrew Gallant
parent c4732ca012
commit 8b9eba2147
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ignore/src/gitignore.rs
View File

@ -455,7 +455,7 @@ impl GitignoreBuilder {
// anywhere, so use a **/ prefix. // anywhere, so use a **/ prefix.
if !is_absolute { if !is_absolute {
// ... but only if we don't already have a **/ prefix. // ... but only if we don't already have a **/ prefix.
if !glob.actual.starts_with("**/") { if !(glob.actual.starts_with("**/") || (glob.actual == "**" && glob.is_only_dir)) {
glob.actual = format!("**/{}", glob.actual); glob.actual = format!("**/{}", glob.actual);
} }
} }
@ -620,6 +620,7 @@ mod tests {
ignored!(ig28, ROOT, "src/*.rs", "src/grep/src/main.rs"); ignored!(ig28, ROOT, "src/*.rs", "src/grep/src/main.rs");
ignored!(ig29, "./src", "/llvm/", "./src/llvm", true); ignored!(ig29, "./src", "/llvm/", "./src/llvm", true);
ignored!(ig30, ROOT, "node_modules/ ", "node_modules", true); ignored!(ig30, ROOT, "node_modules/ ", "node_modules", true);
ignored!(ig31, ROOT, "**/", "foo/bar", true);
not_ignored!(ignot1, ROOT, "amonths", "months"); not_ignored!(ignot1, ROOT, "amonths", "months");
not_ignored!(ignot2, ROOT, "monthsa", "months"); not_ignored!(ignot2, ROOT, "monthsa", "months");
@ -638,6 +639,7 @@ mod tests {
ignot14, "./third_party/protobuf", "m4/ltoptions.m4", ignot14, "./third_party/protobuf", "m4/ltoptions.m4",
"./third_party/protobuf/csharp/src/packages/repositories.config"); "./third_party/protobuf/csharp/src/packages/repositories.config");
not_ignored!(ignot15, ROOT, "!/bar", "foo/bar"); not_ignored!(ignot15, ROOT, "!/bar", "foo/bar");
not_ignored!(ignot16, ROOT, "*\n!**/", "foo", true);
fn bytes(s: &str) -> Vec<u8> { fn bytes(s: &str) -> Vec<u8> {
s.to_string().into_bytes() s.to_string().into_bytes()