[ty] Make Module a Salsa ingredient

crates/ruff_graph/src/resolver.rs

@@ -20,7 +20,7 @@ impl<'a> Resolver<'a> {
         match import {
             CollectedImport::Import(import) => {
                 let module = resolve_module(self.db, &import)?;
-                Some(module.file()?.path(self.db))
+                Some(module.file(self.db)?.path(self.db))
             }
             CollectedImport::ImportFrom(import) => {
                 // Attempt to resolve the member (e.g., given `from foo import bar`, look for `foo.bar`).
@@ -32,7 +32,7 @@ impl<'a> Resolver<'a> {
                     resolve_module(self.db, &parent?)
                 })?;
 
-                Some(module.file()?.path(self.db))
+                Some(module.file(self.db)?.path(self.db))
             }
         }
     }

crates/ruff_python_semantic/src/analyze/visibility.rs

@@ -163,7 +163,7 @@ fn stem(path: &str) -> &str {
 }
 
 /// Infer the [`Visibility`] of a module from its path.
-pub(crate) fn module_visibility(module: &Module) -> Visibility {
+pub(crate) fn module_visibility(module: Module) -> Visibility {
     match &module.source {
         ModuleSource::Path(path) => {
             if path.iter().any(|m| is_private_module(m)) {

crates/ruff_python_semantic/src/definition.rs

@@ -223,7 +223,7 @@ impl<'a> Definitions<'a> {
             // visibility.
             let visibility = {
                 match &definition {
-                    Definition::Module(module) => module_visibility(module),
+                    Definition::Module(module) => module_visibility(*module),
                     Definition::Member(member) => match member.kind {
                         MemberKind::Class(class) => {
                             let parent = &definitions[member.parent];

crates/ty/tests/file_watching.rs

@@ -230,6 +230,21 @@ impl TestCase {
     fn system_file(&self, path: impl AsRef<SystemPath>) -> Result<File, FileError> {
         system_path_to_file(self.db(), path.as_ref())
     }
+
+    fn module<'c>(&'c self, name: &str) -> Module<'c> {
+        resolve_module(self.db(), &ModuleName::new(name).unwrap()).expect("module to be present")
+    }
+
+    fn sorted_submodule_names(&self, parent_module_name: &str) -> Vec<String> {
+        let mut names = self
+            .module(parent_module_name)
+            .all_submodules(self.db())
+            .iter()
+            .map(|name| name.as_str().to_string())
+            .collect::<Vec<String>>();
+        names.sort();
+        names
+    }
 }
 
 trait MatchEvent {
@@ -1398,7 +1413,7 @@ mod unix {
         let baz = resolve_module(case.db(), &ModuleName::new_static("bar.baz").unwrap())
             .expect("Expected bar.baz to exist in site-packages.");
         let baz_project = case.project_path("bar/baz.py");
-        let baz_file = baz.file().unwrap();
+        let baz_file = baz.file(case.db()).unwrap();
 
         assert_eq!(source_text(case.db(), baz_file).as_str(), "def baz(): ...");
         assert_eq!(
@@ -1473,7 +1488,7 @@ mod unix {
 
         let baz = resolve_module(case.db(), &ModuleName::new_static("bar.baz").unwrap())
             .expect("Expected bar.baz to exist in site-packages.");
-        let baz_file = baz.file().unwrap();
+        let baz_file = baz.file(case.db()).unwrap();
         let bar_baz = case.project_path("bar/baz.py");
 
         let patched_bar_baz = case.project_path("patched/bar/baz.py");
@@ -1594,7 +1609,10 @@ mod unix {
             "def baz(): ..."
         );
         assert_eq!(
-            baz.file().unwrap().path(case.db()).as_system_path(),
+            baz.file(case.db())
+                .unwrap()
+                .path(case.db())
+                .as_system_path(),
             Some(&*baz_original)
         );
 
@@ -1891,19 +1909,9 @@ fn rename_files_casing_only() -> anyhow::Result<()> {
 #[test]
 fn submodule_cache_invalidation_created() -> anyhow::Result<()> {
     let mut case = setup([("lib.py", ""), ("bar/__init__.py", ""), ("bar/foo.py", "")])?;
-    let module = resolve_module(case.db(), &ModuleName::new("bar").unwrap()).expect("`bar` module");
-    let get_submodules = |db: &dyn Db, module: &Module| {
-        let mut names = module
-            .all_submodules(db)
-            .iter()
-            .map(|name| name.as_str().to_string())
-            .collect::<Vec<String>>();
-        names.sort();
-        names.join("\n")
-    };
 
     insta::assert_snapshot!(
-        get_submodules(case.db(), &module),
+        case.sorted_submodule_names("bar").join("\n"),
         @"foo",
     );
 
@@ -1912,7 +1920,7 @@ fn submodule_cache_invalidation_created() -> anyhow::Result<()> {
     case.apply_changes(changes, None);
 
     insta::assert_snapshot!(
-        get_submodules(case.db(), &module),
+        case.sorted_submodule_names("bar").join("\n"),
         @r"
     foo
     wazoo
@@ -1932,19 +1940,9 @@ fn submodule_cache_invalidation_deleted() -> anyhow::Result<()> {
         ("bar/foo.py", ""),
         ("bar/wazoo.py", ""),
     ])?;
-    let module = resolve_module(case.db(), &ModuleName::new("bar").unwrap()).expect("`bar` module");
-    let get_submodules = |db: &dyn Db, module: &Module| {
-        let mut names = module
-            .all_submodules(db)
-            .iter()
-            .map(|name| name.as_str().to_string())
-            .collect::<Vec<String>>();
-        names.sort();
-        names.join("\n")
-    };
 
     insta::assert_snapshot!(
-        get_submodules(case.db(), &module),
+        case.sorted_submodule_names("bar").join("\n"),
         @r"
     foo
     wazoo
@@ -1956,7 +1954,7 @@ fn submodule_cache_invalidation_deleted() -> anyhow::Result<()> {
     case.apply_changes(changes, None);
 
     insta::assert_snapshot!(
-        get_submodules(case.db(), &module),
+        case.sorted_submodule_names("bar").join("\n"),
         @"foo",
     );
 
@@ -1968,19 +1966,9 @@ fn submodule_cache_invalidation_deleted() -> anyhow::Result<()> {
 #[test]
 fn submodule_cache_invalidation_created_then_deleted() -> anyhow::Result<()> {
     let mut case = setup([("lib.py", ""), ("bar/__init__.py", ""), ("bar/foo.py", "")])?;
-    let module = resolve_module(case.db(), &ModuleName::new("bar").unwrap()).expect("`bar` module");
-    let get_submodules = |db: &dyn Db, module: &Module| {
-        let mut names = module
-            .all_submodules(db)
-            .iter()
-            .map(|name| name.as_str().to_string())
-            .collect::<Vec<String>>();
-        names.sort();
-        names.join("\n")
-    };
 
     insta::assert_snapshot!(
-        get_submodules(case.db(), &module),
+        case.sorted_submodule_names("bar").join("\n"),
         @"foo",
     );
 
@@ -1993,7 +1981,7 @@ fn submodule_cache_invalidation_created_then_deleted() -> anyhow::Result<()> {
     case.apply_changes(changes, None);
 
     insta::assert_snapshot!(
-        get_submodules(case.db(), &module),
+        case.sorted_submodule_names("bar").join("\n"),
         @"foo",
     );
 
@@ -2006,19 +1994,9 @@ fn submodule_cache_invalidation_created_then_deleted() -> anyhow::Result<()> {
 #[test]
 fn submodule_cache_invalidation_after_pyproject_created() -> anyhow::Result<()> {
     let mut case = setup([("lib.py", ""), ("bar/__init__.py", ""), ("bar/foo.py", "")])?;
-    let module = resolve_module(case.db(), &ModuleName::new("bar").unwrap()).expect("`bar` module");
-    let get_submodules = |db: &dyn Db, module: &Module| {
-        let mut names = module
-            .all_submodules(db)
-            .iter()
-            .map(|name| name.as_str().to_string())
-            .collect::<Vec<String>>();
-        names.sort();
-        names.join("\n")
-    };
 
     insta::assert_snapshot!(
-        get_submodules(case.db(), &module),
+        case.sorted_submodule_names("bar").join("\n"),
         @"foo",
     );
 
@@ -2029,7 +2007,7 @@ fn submodule_cache_invalidation_after_pyproject_created() -> anyhow::Result<()>
     case.apply_changes(changes, None);
 
     insta::assert_snapshot!(
-        get_submodules(case.db(), &module),
+        case.sorted_submodule_names("bar").join("\n"),
         @r"
     foo
     wazoo

crates/ty_ide/src/goto.rs

@@ -525,7 +525,7 @@ fn resolve_module_to_navigation_target(
 
     if let Some(module_name) = ModuleName::new(module_name_str) {
         if let Some(resolved_module) = resolve_module(db, &module_name) {
-            if let Some(module_file) = resolved_module.file() {
+            if let Some(module_file) = resolved_module.file(db) {
                 return Some(crate::NavigationTargets::single(crate::NavigationTarget {
                     file: module_file,
                     focus_range: TextRange::default(),

crates/ty_python_semantic/src/dunder_all.rs

@@ -103,7 +103,7 @@ impl<'db> DunderAllNamesCollector<'db> {
                 };
                 let Some(module_dunder_all_names) = module_literal
                     .module(self.db)
-                    .file()
+                    .file(self.db)
                     .and_then(|file| dunder_all_names(self.db, file))
                 else {
                     // The module either does not have a `__all__` variable or it is invalid.
@@ -173,7 +173,7 @@ impl<'db> DunderAllNamesCollector<'db> {
         let module_name =
             ModuleName::from_import_statement(self.db, self.file, import_from).ok()?;
         let module = resolve_module(self.db, &module_name)?;
-        dunder_all_names(self.db, module.file()?)
+        dunder_all_names(self.db, module.file(self.db)?)
     }
 
     /// Infer the type of a standalone expression.

crates/ty_python_semantic/src/module_name.rs

@@ -345,12 +345,12 @@ fn relative_module_name(
         .ok_or(ModuleNameResolutionError::UnknownCurrentModule)?;
     let mut level = level.get();
 
-    if module.kind().is_package() {
+    if module.kind(db).is_package() {
         level = level.saturating_sub(1);
     }
 
     let mut module_name = module
-        .name()
+        .name(db)
         .ancestors()
         .nth(level as usize)
         .ok_or(ModuleNameResolutionError::TooManyDots)?;