Skip to content

Filter project excludes for site package path entries if they would exclude search path #1533

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Filter project excludes for site package path entries if they would exclude search path #1533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions crates/pyrefly_config/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ impl ConfigFile {
excludes.append(
&self
.site_package_path()
.filter(|p| self.import_root.as_ref().is_none_or(|r| !r.starts_with(p)))
.filter(|p| !self.search_path().any(|r| r.starts_with(p)))
.filter_map(|p| Glob::new(p.to_string_lossy().to_string()).ok())
.collect::<Vec<_>>(),
);
Expand Down Expand Up @@ -1800,6 +1800,7 @@ mod tests {
let site_package_path = vec![
"venv/site_packages".to_owned(),
"system/site_packages".to_owned(),
"my_search_path".to_owned(),
];
config.interpreters.skip_interpreter_query = true;
config.python_environment.site_package_path = Some(
Expand All @@ -1808,10 +1809,16 @@ mod tests {
.map(PathBuf::from)
.collect::<Vec<_>>(),
);
config.search_path_from_file = vec![PathBuf::from("my_search_path")];
config.project_excludes = ConfigFile::required_project_excludes();

config.configure();

let mut expected_site_package_path = site_package_path;
// get rid of "my_search_path" in site package path, since it's going to be removed
// when we add site package path to project excludes
expected_site_package_path.pop();

assert_eq!(
config.get_filtered_globs(None),
FilteredGlobs::new(
Expand All @@ -1830,7 +1837,7 @@ mod tests {
"**/venv/**".to_owned(),
"**/.[!/.]*/**".to_owned(),
])
.chain(site_package_path.clone())
.chain(expected_site_package_path.clone())
.collect::<Vec<_>>()
)
.unwrap(),
Expand All @@ -1852,7 +1859,7 @@ mod tests {
"**/venv/**".to_owned(),
"**/.[!/.]*/**".to_owned(),
])
.chain(site_package_path)
.chain(expected_site_package_path)
.collect::<Vec<_>>()
)
.unwrap(),
Expand Down