Skip to content
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.

Sign up for GitHub

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

Ignore directories when collecting files to lint #5775

Merged
merged 3 commits into from
Jul 18, 2023
Merged

Ignore directories when collecting files to lint #5775

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f056703
Ignore directories when collecting files to lint
harupy Jul 15, 2023
d898ffa
Fix clippy error
harupy Jul 15, 2023
66a7eda
Apply suggestion
harupy Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions crates/ruff/src/resolver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,14 @@ pub fn python_files_in_path(
}
}

if result.as_ref().map_or(true, |entry| {
let should_include = result.as_ref().map_or(true, |entry| {
// Ignore directories
if entry.file_type().map_or(true, |ft| ft.is_dir()) {
return false;
}
if entry.depth() == 0 {
// Accept all files that are passed-in directly.
entry.file_type().map_or(false, |ft| ft.is_file())
true
} else {
// Otherwise, check if the file is included.
let path = entry.path();
Expand All @@ -348,7 +352,8 @@ pub fn python_files_in_path(
false
}
}
}) {
});
if should_include {
files.lock().unwrap().push(result);
}

Expand Down