Support import namespace

Author: MichaReiser

crates/ruff_db/src/files.rs

@@ -79,7 +79,7 @@ impl Files {
     ///
     /// The operation always succeeds even if the path doesn't exist on disk, isn't accessible or if the path points to a directory.
     /// In these cases, a file with status [`FileStatus::NotFound`] is returned.
-    fn system(&self, db: &dyn Db, path: &SystemPath) -> File {
+    pub fn system(&self, db: &dyn Db, path: &SystemPath) -> File {
         let absolute = SystemPath::absolute(path, db.system().current_directory());
 
         *self

crates/ruff_graph/src/resolver.rs

@@ -18,19 +18,19 @@ impl<'a> Resolver<'a> {
     /// Resolve the [`CollectedImport`] into a [`FilePath`].
     pub(crate) fn resolve(&self, import: CollectedImport) -> Option<&'a FilePath> {
         match import {
-            CollectedImport::Import(import) => {
-                resolve_module(self.db, &import).map(|module| module.file().path(self.db))
-            }
+            CollectedImport::Import(import) => resolve_module(self.db, &import)
+                .and_then(|module| Some(module.file()?.path(self.db))),
             CollectedImport::ImportFrom(import) => {
                 // Attempt to resolve the member (e.g., given `from foo import bar`, look for `foo.bar`).
                 let parent = import.parent();
 
                 resolve_module(self.db, &import)
-                    .map(|module| module.file().path(self.db))
+                    .and_then(|module| Some(module.file()?.path(self.db)))
                     .or_else(|| {
                         // Attempt to resolve the module (e.g., given `from foo import bar`, look for `foo`).
 
-                        resolve_module(self.db, &parent?).map(|module| module.file().path(self.db))
+                        resolve_module(self.db, &parent?)
+                            .and_then(|module| Some(module.file()?.path(self.db)))
                     })
             }
         }

crates/ty/tests/file_watching.rs

@@ -1444,13 +1444,11 @@ mod unix {
         )
         .expect("Expected bar.baz to exist in site-packages.");
         let baz_project = case.project_path("bar/baz.py");
+        let baz_file = baz.file().unwrap();
 
+        assert_eq!(source_text(case.db(), baz_file).as_str(), "def baz(): ...");
         assert_eq!(
-            source_text(case.db(), baz.file()).as_str(),
-            "def baz(): ..."
-        );
-        assert_eq!(
-            baz.file().path(case.db()).as_system_path(),
+            baz_file.path(case.db()).as_system_path(),
             Some(&*baz_project)
         );
 
@@ -1465,7 +1463,7 @@ mod unix {
         case.apply_changes(changes);
 
         assert_eq!(
-            source_text(case.db(), baz.file()).as_str(),
+            source_text(case.db(), baz_file).as_str(),
             "def baz(): print('Version 2')"
         );
 
@@ -1478,7 +1476,7 @@ mod unix {
         case.apply_changes(changes);
 
         assert_eq!(
-            source_text(case.db(), baz.file()).as_str(),
+            source_text(case.db(), baz_file).as_str(),
             "def baz(): print('Version 3')"
         );
 
@@ -1524,6 +1522,7 @@ mod unix {
             &ModuleName::new_static("bar.baz").unwrap(),
         )
         .expect("Expected bar.baz to exist in site-packages.");
+        let baz_file = baz.file().unwrap();
         let bar_baz = case.project_path("bar/baz.py");
 
         let patched_bar_baz = case.project_path("patched/bar/baz.py");
@@ -1534,11 +1533,8 @@ mod unix {
             "def baz(): ..."
         );
 
-        assert_eq!(
-            source_text(case.db(), baz.file()).as_str(),
-            "def baz(): ..."
-        );
-        assert_eq!(baz.file().path(case.db()).as_system_path(), Some(&*bar_baz));
+        assert_eq!(source_text(case.db(), baz_file).as_str(), "def baz(): ...");
+        assert_eq!(baz_file.path(case.db()).as_system_path(), Some(&*bar_baz));
 
         case.assert_indexed_project_files([patched_bar_baz_file]);
 
@@ -1567,7 +1563,7 @@ mod unix {
         let patched_baz_text = source_text(case.db(), patched_bar_baz_file);
         let did_update_patched_baz = patched_baz_text.as_str() == "def baz(): print('Version 2')";
 
-        let bar_baz_text = source_text(case.db(), baz.file());
+        let bar_baz_text = source_text(case.db(), baz_file);
         let did_update_bar_baz = bar_baz_text.as_str() == "def baz(): print('Version 2')";
 
         assert!(
@@ -1650,7 +1646,7 @@ mod unix {
             "def baz(): ..."
         );
         assert_eq!(
-            baz.file().path(case.db()).as_system_path(),
+            baz.file().unwrap().path(case.db()).as_system_path(),
             Some(&*baz_original)
         );
 

crates/ty_ide/src/lib.rs

@@ -188,7 +188,10 @@ impl HasNavigationTargets for Type<'_> {
 
 impl HasNavigationTargets for TypeDefinition<'_> {
     fn navigation_targets(&self, db: &dyn Db) -> NavigationTargets {
-        let full_range = self.full_range(db.upcast());
+        let Some(full_range) = self.full_range(db.upcast()) else {
+            return NavigationTargets::empty();
+        };
+
         NavigationTargets::single(NavigationTarget {
             file: full_range.file(),
             focus_range: self.focus_range(db.upcast()).unwrap_or(full_range).range(),

crates/ty_python_semantic/resources/mdtest/import/namespace.md

@@ -29,8 +29,10 @@ import parent.child.two
 `from.py`
 
 ```py
-# TODO: This should not be an error
-from parent.child import one, two  # error: [unresolved-import]
+from parent.child import one, two 
+
+reveal_type(one)  # revealed: <module 'parent.child.one'>
+reveal_type(two) # revealed: <module 'parent.child.two'>
 ```
 
 ## Regular package in namespace package

crates/ty_python_semantic/src/dunder_all.rs

@@ -109,8 +109,10 @@ impl<'db> DunderAllNamesCollector<'db> {
                 else {
                     return false;
                 };
-                let Some(module_dunder_all_names) =
-                    dunder_all_names(self.db, module_literal.module(self.db).file())
+                let Some(module_dunder_all_names) = module_literal
+                    .module(self.db)
+                    .file()
+                    .and_then(|file| dunder_all_names(self.db, file))
                 else {
                     // The module either does not have a `__all__` variable or it is invalid.
                     return false;
@@ -179,7 +181,12 @@ 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())
+
+        if let Some(file) = module.file() {
+            dunder_all_names(self.db, file)
+        } else {
+            None
+        }
     }
 
     /// Infer the type of a standalone expression.

crates/ty_python_semantic/src/module_resolver/module.rs

@@ -17,10 +17,13 @@ impl Module {
     pub(crate) fn new(
         name: ModuleName,
         kind: ModuleKind,
-        search_path: SearchPath,
-        file: File,
+        search_path: Option<SearchPath>,
+        file: Option<File>,
     ) -> Self {
-        let known = KnownModule::try_from_search_path_and_name(&search_path, &name);
+        let known = search_path
+            .as_ref()
+            .and_then(|search_path| KnownModule::try_from_search_path_and_name(search_path, &name));
+
         Self {
             inner: Arc::new(ModuleInner {
                 name,
@@ -38,7 +41,9 @@ impl Module {
     }
 
     /// The file to the source code that defines this module
-    pub fn file(&self) -> File {
+    ///
+    /// This is `None` for namespace packages.
+    pub fn file(&self) -> Option<File> {
         self.inner.file
     }
 
@@ -53,8 +58,8 @@ impl Module {
     }
 
     /// The search path from which the module was resolved.
-    pub(crate) fn search_path(&self) -> &SearchPath {
-        &self.inner.search_path
+    pub(crate) fn search_path(&self) -> Option<&SearchPath> {
+        self.inner.search_path.as_ref()
     }
 
     /// Determine whether this module is a single-file module or a package
@@ -78,8 +83,8 @@ impl std::fmt::Debug for Module {
 struct ModuleInner {
     name: ModuleName,
     kind: ModuleKind,
-    search_path: SearchPath,
-    file: File,
+    search_path: Option<SearchPath>,
+    file: Option<File>,
     known: Option<KnownModule>,
 }