Skip to content

[ty] Fix notifications about watched changes for entities outside any workspace #24775

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

Merged
EliteTK merged 2 commits into from
Apr 22, 2026
Merged

[ty] Fix notifications about watched changes for entities outside any workspace #24775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
081ef08
[ty] Use a slice for changes
EliteTK Apr 21, 2026
41d0607
[ty] Distribute watched file change events to all dbs
EliteTK Apr 21, 2026
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
2 changes: 1 addition & 1 deletion crates/ruff_benchmark/benches/ty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ fn benchmark_incremental(criterion: &mut Criterion) {
let Case { db, .. } = case;

db.apply_changes(
vec![ChangeEvent::Changed {
&[ChangeEvent::Changed {
path: case.file_path.clone(),
kind: ChangedKind::FileContent,
}],
Expand Down
2 changes: 1 addition & 1 deletion crates/ty/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ impl MainLoop {

revision += 1;
// Automatically cancels any pending queries and waits for them to complete.
db.apply_changes(changes, Some(&self.project_options_overrides));
db.apply_changes(&changes, Some(&self.project_options_overrides));
if let Some(watcher) = self.watcher.as_mut() {
watcher.update(db);
}
Expand Down
70 changes: 35 additions & 35 deletions crates/ty/tests/file_watching.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ impl TestCase {

fn apply_changes(
&mut self,
changes: Vec<ChangeEvent>,
changes: &[ChangeEvent],
project_options_overrides: Option<&ProjectOptionsOverrides>,
) {
self.db.apply_changes(changes, project_options_overrides);
Expand All @@ -193,7 +193,7 @@ impl TestCase {
.context("Failed to write configuration")?;

let changes = self.take_watch_changes(event_for_file("pyproject.toml"));
self.apply_changes(changes, None);
self.apply_changes(&changes, None);

if let Some(watcher) = &mut self.watcher {
watcher.update(&self.db);
Expand Down Expand Up @@ -521,7 +521,7 @@ fn new_file() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

let foo = case.system_file(&foo_path).expect("foo.py to exist.");

Expand All @@ -544,7 +544,7 @@ fn new_ignored_file() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert!(case.system_file(&foo_path).is_ok());
case.assert_indexed_project_files([bar_file]);
Expand Down Expand Up @@ -580,7 +580,7 @@ fn new_non_project_file() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

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

Expand Down Expand Up @@ -621,7 +621,7 @@ fn new_files_with_explicit_included_paths() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

let sub_a_file = case.system_file(&sub_a_path).expect("sub/a.py to exist");

Expand Down Expand Up @@ -666,7 +666,7 @@ fn new_file_in_included_out_of_project_directory() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

let src_a_file = case.system_file(&src_a).unwrap();
let outside_b_file = case.system_file(&outside_b_path).unwrap();
Expand All @@ -693,7 +693,7 @@ fn changed_file() -> anyhow::Result<()> {

assert!(!changes.is_empty());

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert_eq!(source_text(case.db(), foo).as_str(), "print('Version 2')");
case.assert_indexed_project_files([foo]);
Expand All @@ -716,7 +716,7 @@ fn deleted_file() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert!(!foo.exists(case.db()));
case.assert_indexed_project_files([]);
Expand Down Expand Up @@ -748,7 +748,7 @@ fn move_file_to_trash() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert!(!foo.exists(case.db()));
case.assert_indexed_project_files([]);
Expand All @@ -775,7 +775,7 @@ fn move_file_to_project() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

let foo_in_project = case.system_file(&foo_in_project)?;

Expand All @@ -800,7 +800,7 @@ fn rename_file() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert!(!foo.exists(case.db()));

Expand Down Expand Up @@ -839,7 +839,7 @@ fn directory_moved_to_project() -> anyhow::Result<()> {

let changes = case.stop_watch(event_for_file("sub"));

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

let init_file = case
.system_file(sub_new_path.join("__init__.py"))
Expand Down Expand Up @@ -888,7 +888,7 @@ fn directory_moved_to_trash() -> anyhow::Result<()> {

let changes = case.stop_watch(event_for_file("sub"));

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

// `import sub.a` should no longer resolve
assert!(
Expand Down Expand Up @@ -939,7 +939,7 @@ fn directory_renamed() -> anyhow::Result<()> {
// Linux and windows only emit an event for the newly created root directory, but not for every new component.
let changes = case.stop_watch(event_for_file("sub"));

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

// `import sub.a` should no longer resolve
assert!(
Expand Down Expand Up @@ -1000,7 +1000,7 @@ fn directory_deleted() -> anyhow::Result<()> {

let changes = case.stop_watch(event_for_file("sub"));

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

// `import sub.a` should no longer resolve
assert!(
Expand Down Expand Up @@ -1042,7 +1042,7 @@ fn search_path() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert!(resolve_module_confident(case.db(), &ModuleName::new_static("a").unwrap()).is_some());
case.assert_indexed_project_files([case.system_file(case.project_path("bar.py")).unwrap()]);
Expand Down Expand Up @@ -1073,7 +1073,7 @@ fn add_search_path() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert!(resolve_module_confident(case.db(), &ModuleName::new_static("a").unwrap()).is_some());

Expand Down Expand Up @@ -1220,7 +1220,7 @@ fn changed_versions_file() -> anyhow::Result<()> {

let changes = case.stop_watch(event_for_file("VERSIONS"));

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert!(resolve_module_confident(case.db(), &ModuleName::new_static("os").unwrap()).is_some());

Expand Down Expand Up @@ -1274,7 +1274,7 @@ fn hard_links_in_project() -> anyhow::Result<()> {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert_eq!(source_text(case.db(), foo).as_str(), "print('Version 2')");

Expand Down Expand Up @@ -1345,7 +1345,7 @@ fn hard_links_to_target_outside_project() -> anyhow::Result<()> {

let changes = case.stop_watch(ChangeEvent::is_changed);

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert_eq!(source_text(case.db(), bar).as_str(), "print('Version 2')");

Expand Down Expand Up @@ -1384,7 +1384,7 @@ mod unix {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert_eq!(
foo.permissions(case.db()),
Expand Down Expand Up @@ -1464,7 +1464,7 @@ mod unix {

let changes = case.take_watch_changes(event_for_file("baz.py"));

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert_eq!(
source_text(case.db(), baz_file).as_str(),
Expand All @@ -1477,7 +1477,7 @@ mod unix {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert_eq!(
source_text(case.db(), baz_file).as_str(),
Expand Down Expand Up @@ -1545,7 +1545,7 @@ mod unix {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

// The file watcher is guaranteed to emit one event for the changed file, but it isn't specified
// if the event is emitted for the "original" or linked path because both paths are watched.
Expand Down Expand Up @@ -1659,7 +1659,7 @@ mod unix {

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

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

assert_eq!(
source_text(case.db(), baz_original_file).as_str(),
Expand Down Expand Up @@ -1716,7 +1716,7 @@ fn nested_projects_delete_root() -> anyhow::Result<()> {

let changes = case.stop_watch(ChangeEvent::is_deleted);

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

// It should now pick up the outer project.
assert_eq!(case.db().project().root(case.db()), case.root_path());
Expand Down Expand Up @@ -1782,7 +1782,7 @@ fn changes_to_user_configuration() -> anyhow::Result<()> {

let changes = case.stop_watch(event_for_file("ty.toml"));

case.apply_changes(changes, None);
case.apply_changes(&changes, None);

let diagnostics = case.db().check_file(foo);

Expand Down Expand Up @@ -1843,7 +1843,7 @@ fn changes_to_config_file_override() -> anyhow::Result<()> {
let changes = case.stop_watch(event_for_file("ty-override.toml"));

case.apply_changes(
changes,
&changes,
Some(&ProjectOptionsOverrides::new(
Some(case.project_path("ty-override.toml")),
Options::default(),
Expand Down Expand Up @@ -1922,7 +1922,7 @@ fn rename_files_casing_only() -> anyhow::Result<()> {
}

let changes = case.stop_watch(event_for_file("Lib.py"));
case.apply_changes(changes, None);
case.apply_changes(&changes, None);

// Resolving `lib` should now fail but `Lib` should now succeed
assert_eq!(
Expand Down Expand Up @@ -1952,7 +1952,7 @@ fn submodule_cache_invalidation_created() -> anyhow::Result<()> {

std::fs::write(case.project_path("bar/wazoo.py").as_std_path(), "")?;
let changes = case.stop_watch(event_for_file("wazoo.py"));
case.apply_changes(changes, None);
case.apply_changes(&changes, None);

insta::assert_snapshot!(
case.sorted_submodule_names("bar").join("\n"),
Expand Down Expand Up @@ -1986,7 +1986,7 @@ fn submodule_cache_invalidation_deleted() -> anyhow::Result<()> {

std::fs::remove_file(case.project_path("bar/wazoo.py").as_std_path())?;
let changes = case.stop_watch(event_for_file("wazoo.py"));
case.apply_changes(changes, None);
case.apply_changes(&changes, None);

insta::assert_snapshot!(
case.sorted_submodule_names("bar").join("\n"),
Expand All @@ -2009,11 +2009,11 @@ fn submodule_cache_invalidation_created_then_deleted() -> anyhow::Result<()> {

std::fs::write(case.project_path("bar/wazoo.py").as_std_path(), "")?;
let changes = case.take_watch_changes(event_for_file("wazoo.py"));
case.apply_changes(changes, None);
case.apply_changes(&changes, None);

std::fs::remove_file(case.project_path("bar/wazoo.py").as_std_path())?;
let changes = case.stop_watch(event_for_file("wazoo.py"));
case.apply_changes(changes, None);
case.apply_changes(&changes, None);

insta::assert_snapshot!(
case.sorted_submodule_names("bar").join("\n"),
Expand All @@ -2039,7 +2039,7 @@ fn submodule_cache_invalidation_after_pyproject_created() -> anyhow::Result<()>

std::fs::write(case.project_path("bar/wazoo.py").as_std_path(), "")?;
let changes = case.take_watch_changes(event_for_file("wazoo.py"));
case.apply_changes(changes, None);
case.apply_changes(&changes, None);

insta::assert_snapshot!(
case.sorted_submodule_names("bar").join("\n"),
Expand Down
Loading
Loading