45ac30a4d7
## Summary This makes an importing file a required argument to module resolution, and if the fast-path cached query fails to resolve the module, take the slow-path uncached (could be cached if we want) `desperately_resolve_module` which will walk up from the importing file until it finds a `pyproject.toml` (arbitrary decision, we could try every ancestor directory), at which point it takes one last desperate attempt to use that directory as a search-path. We do not continue walking up once we've found a `pyproject.toml` (arbitrary decision, we could keep going up). Running locally, this fixes every broken-for-workspace-reasons import in pyx's workspace! * Fixes https://github.com/astral-sh/ty/issues/1539 * Improves https://github.com/astral-sh/ty/issues/839 ## Test Plan The workspace tests see a huge improvement on most absolute imports.
55 lines
1.5 KiB
Rust
55 lines
1.5 KiB
Rust
use std::iter::FusedIterator;
|
|
|
|
pub use list::{all_modules, list_modules};
|
|
pub use module::KnownModule;
|
|
pub use module::Module;
|
|
pub use path::{SearchPath, SearchPathValidationError};
|
|
pub use resolver::SearchPaths;
|
|
pub(crate) use resolver::file_to_module;
|
|
pub use resolver::{
|
|
resolve_module, resolve_module_confident, resolve_real_module, resolve_real_module_confident,
|
|
resolve_real_shadowable_module,
|
|
};
|
|
use ruff_db::system::SystemPath;
|
|
|
|
use crate::Db;
|
|
pub(crate) use resolver::{ModuleResolveMode, SearchPathIterator, search_paths};
|
|
|
|
mod list;
|
|
mod module;
|
|
mod path;
|
|
mod resolver;
|
|
mod typeshed;
|
|
|
|
#[cfg(test)]
|
|
mod testing;
|
|
|
|
/// Returns an iterator over all search paths pointing to a system path
|
|
pub fn system_module_search_paths(db: &dyn Db) -> SystemModuleSearchPathsIter<'_> {
|
|
SystemModuleSearchPathsIter {
|
|
// Always run in `StubsAllowed` mode because we want to include as much as possible
|
|
// and we don't care about the "real" stdlib
|
|
inner: search_paths(db, ModuleResolveMode::StubsAllowed),
|
|
}
|
|
}
|
|
|
|
pub struct SystemModuleSearchPathsIter<'db> {
|
|
inner: SearchPathIterator<'db>,
|
|
}
|
|
|
|
impl<'db> Iterator for SystemModuleSearchPathsIter<'db> {
|
|
type Item = &'db SystemPath;
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
loop {
|
|
let next = self.inner.next()?;
|
|
|
|
if let Some(system_path) = next.as_system_path() {
|
|
return Some(system_path);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl FusedIterator for SystemModuleSearchPathsIter<'_> {}
|