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.

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

[red-knot] Fix file watching for new non-project files #16395

Merged
merged 1 commit into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 43 additions & 0 deletions crates/red_knot/tests/file_watching.rs
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,41 @@ fn new_ignored_file() -> anyhow::Result<()> {
Ok(())
}

#[test]
fn new_non_project_file() -> anyhow::Result<()> {
let mut case = setup_with_options([("bar.py", "")], |context| {
Some(Options {
environment: Some(EnvironmentOptions {
extra_paths: Some(vec![RelativePathBuf::cli(
context.join_root_path("site_packages"),
)]),
..EnvironmentOptions::default()
}),
..Options::default()
})
})?;

let bar_path = case.project_path("bar.py");
let bar_file = case.system_file(&bar_path).unwrap();

assert_eq!(&case.collect_project_files(), &[bar_file]);

// Add a file to site packages
let black_path = case.root_path().join("site_packages/black.py");
std::fs::write(black_path.as_std_path(), "print('Hello')")?;

let changes = case.stop_watch(event_for_file("black.py"));

case.apply_changes(changes);

assert!(case.system_file(&black_path).is_ok());

// The file should not have been added to the project files
assert_eq!(&case.collect_project_files(), &[bar_file]);

Ok(())
}

#[test]
fn changed_file() -> anyhow::Result<()> {
let foo_source = "print('Hello, world!')";
Expand Down Expand Up @@ -1075,6 +1110,7 @@ fn hard_links_in_project() -> anyhow::Result<()> {

assert_eq!(source_text(case.db(), foo).as_str(), "print('Version 1')");
assert_eq!(source_text(case.db(), bar).as_str(), "print('Version 1')");
assert_eq!(case.collect_project_files(), &[bar, foo]);

// Write to the hard link target.
update_file(foo_path, "print('Version 2')").context("Failed to update foo.py")?;
Expand Down Expand Up @@ -1354,6 +1390,8 @@ mod unix {
);
assert_eq!(baz.file().path(case.db()).as_system_path(), Some(&*bar_baz));

assert_eq!(case.collect_project_files(), &[patched_bar_baz_file]);

// Write to the symlink target.
update_file(&patched_bar_baz, "def baz(): print('Version 2')")
.context("Failed to update bar/baz.py")?;
Expand Down Expand Up @@ -1389,6 +1427,7 @@ mod unix {
bar_baz_text = bar_baz_text.as_str()
);

assert_eq!(case.collect_project_files(), &[patched_bar_baz_file]);
Ok(())
}

Expand Down Expand Up @@ -1469,6 +1508,8 @@ mod unix {
Some(&*baz_original)
);

assert_eq!(case.collect_project_files(), &[]);

// Write to the symlink target.
update_file(&baz_original, "def baz(): print('Version 2')")
.context("Failed to update bar/baz.py")?;
Expand All @@ -1494,6 +1535,8 @@ mod unix {
"def baz(): print('Version 2')"
);

assert_eq!(case.collect_project_files(), &[]);

Ok(())
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/red_knot_project/src/db/changes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,12 @@ impl ProjectDatabase {
return WalkState::Continue;
}

if entry
.path()
.extension()
.and_then(PySourceType::try_from_extension)
.is_some()
if entry.path().starts_with(&project_path)
&& entry
.path()
.extension()
.and_then(PySourceType::try_from_extension)
.is_some()
{
let mut paths = added_paths.lock().unwrap();

Expand Down
Loading