mirror of
https://github.com/astral-sh/ruff.git
synced 2025-07-19 11:05:24 +00:00

## Summary This is part of the preparation for detecting syntax errors in the parser from https://github.com/astral-sh/ruff/pull/16090/. As suggested in [this comment](https://github.com/astral-sh/ruff/pull/16090/#discussion_r1953084509), I started working on a `ParseOptions` struct that could be stored in the parser. For this initial refactor, I only made it hold the existing `Mode` option, but for syntax errors, we will also need it to have a `PythonVersion`. For that use case, I'm picturing something like a `ParseOptions::with_python_version` method, so you can extend the current calls to something like ```rust ParseOptions::from(mode).with_python_version(settings.target_version) ``` But I thought it was worth adding `ParseOptions` alone without changing any other behavior first. Most of the diff is just updating call sites taking `Mode` to take `ParseOptions::from(Mode)` or those taking `PySourceType`s to take `ParseOptions::from(PySourceType)`. The interesting changes are in the new `parser/options.rs` file and smaller parts of `parser/mod.rs` and `ruff_python_parser/src/lib.rs`. ## Test Plan Existing tests, this should not change any behavior.
123 lines
3.8 KiB
Rust
123 lines
3.8 KiB
Rust
use std::collections::{BTreeMap, BTreeSet};
|
|
|
|
use anyhow::Result;
|
|
|
|
use ruff_db::system::{SystemPath, SystemPathBuf};
|
|
use ruff_python_ast::helpers::to_module_path;
|
|
use ruff_python_parser::{parse, Mode, ParseOptions};
|
|
|
|
use crate::collector::Collector;
|
|
pub use crate::db::ModuleDb;
|
|
use crate::resolver::Resolver;
|
|
pub use crate::settings::{AnalyzeSettings, Direction};
|
|
|
|
mod collector;
|
|
mod db;
|
|
mod resolver;
|
|
mod settings;
|
|
|
|
#[derive(Debug, Default)]
|
|
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
|
|
pub struct ModuleImports(BTreeSet<SystemPathBuf>);
|
|
|
|
impl ModuleImports {
|
|
/// Detect the [`ModuleImports`] for a given Python file.
|
|
pub fn detect(
|
|
db: &ModuleDb,
|
|
path: &SystemPath,
|
|
package: Option<&SystemPath>,
|
|
string_imports: bool,
|
|
) -> Result<Self> {
|
|
// Read and parse the source code.
|
|
let source = std::fs::read_to_string(path)?;
|
|
let parsed = parse(&source, ParseOptions::from(Mode::Module))?;
|
|
|
|
let module_path =
|
|
package.and_then(|package| to_module_path(package.as_std_path(), path.as_std_path()));
|
|
|
|
// Collect the imports.
|
|
let imports =
|
|
Collector::new(module_path.as_deref(), string_imports).collect(parsed.syntax());
|
|
|
|
// Resolve the imports.
|
|
let mut resolved_imports = ModuleImports::default();
|
|
for import in imports {
|
|
let Some(resolved) = Resolver::new(db).resolve(import) else {
|
|
continue;
|
|
};
|
|
let Some(path) = resolved.as_system_path() else {
|
|
continue;
|
|
};
|
|
resolved_imports.insert(path.to_path_buf());
|
|
}
|
|
|
|
Ok(resolved_imports)
|
|
}
|
|
|
|
/// Insert a file path into the module imports.
|
|
pub fn insert(&mut self, path: SystemPathBuf) {
|
|
self.0.insert(path);
|
|
}
|
|
|
|
/// Extend the module imports with additional file paths.
|
|
pub fn extend(&mut self, paths: impl IntoIterator<Item = SystemPathBuf>) {
|
|
self.0.extend(paths);
|
|
}
|
|
|
|
/// Returns `true` if the module imports are empty.
|
|
pub fn is_empty(&self) -> bool {
|
|
self.0.is_empty()
|
|
}
|
|
|
|
/// Returns the number of module imports.
|
|
pub fn len(&self) -> usize {
|
|
self.0.len()
|
|
}
|
|
|
|
/// Convert the file paths to be relative to a given path.
|
|
#[must_use]
|
|
pub fn relative_to(self, path: &SystemPath) -> Self {
|
|
Self(
|
|
self.0
|
|
.into_iter()
|
|
.map(|import| {
|
|
import
|
|
.strip_prefix(path)
|
|
.map(SystemPath::to_path_buf)
|
|
.unwrap_or(import)
|
|
})
|
|
.collect(),
|
|
)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Default)]
|
|
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
|
|
pub struct ImportMap(BTreeMap<SystemPathBuf, ModuleImports>);
|
|
|
|
impl ImportMap {
|
|
/// Create an [`ImportMap`] of file to its dependencies.
|
|
///
|
|
/// Assumes that the input is a collection of unique file paths and their imports.
|
|
pub fn dependencies(imports: impl IntoIterator<Item = (SystemPathBuf, ModuleImports)>) -> Self {
|
|
let mut map = ImportMap::default();
|
|
for (path, imports) in imports {
|
|
map.0.insert(path, imports);
|
|
}
|
|
map
|
|
}
|
|
|
|
/// Create an [`ImportMap`] of file to its dependents.
|
|
///
|
|
/// Assumes that the input is a collection of unique file paths and their imports.
|
|
pub fn dependents(imports: impl IntoIterator<Item = (SystemPathBuf, ModuleImports)>) -> Self {
|
|
let mut reverse = ImportMap::default();
|
|
for (path, imports) in imports {
|
|
for import in imports.0 {
|
|
reverse.0.entry(import).or_default().insert(path.clone());
|
|
}
|
|
reverse.0.entry(path).or_default();
|
|
}
|
|
reverse
|
|
}
|
|
}
|