From 8a25531a7144fd4a6b62c54efde1ef28e2dc18c4 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Fri, 31 May 2024 17:11:18 +0100 Subject: [PATCH] red-knot: improve internal documentation in `module.rs` (#11638) --- crates/red_knot/src/module.rs | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/crates/red_knot/src/module.rs b/crates/red_knot/src/module.rs index f98405055b4d7..6f6ce355db404 100644 --- a/crates/red_knot/src/module.rs +++ b/crates/red_knot/src/module.rs @@ -17,6 +17,7 @@ use crate::FxDashMap; pub struct Module(u32); impl Module { + /// Return the absolute name of the module (e.g. `foo.bar`) pub fn name(&self, db: &dyn SemanticDb) -> QueryResult { let jar: &SemanticJar = db.jar()?; let modules = &jar.module_resolver; @@ -24,6 +25,7 @@ impl Module { Ok(modules.modules.get(self).unwrap().name.clone()) } + /// Return the path to the source code that defines this module pub fn path(&self, db: &dyn SemanticDb) -> QueryResult { let jar: &SemanticJar = db.jar()?; let modules = &jar.module_resolver; @@ -31,6 +33,7 @@ impl Module { Ok(modules.modules.get(self).unwrap().path.clone()) } + /// Determine whether this module is a single-file module or a package pub fn kind(&self, db: &dyn SemanticDb) -> QueryResult { let jar: &SemanticJar = db.jar()?; let modules = &jar.module_resolver; @@ -38,6 +41,16 @@ impl Module { Ok(modules.modules.get(self).unwrap().kind) } + /// Attempt to resolve a dependency of this module to an absolute [`ModuleName`]. + /// + /// A dependency could be either absolute (e.g. the `foo` dependency implied by `from foo import bar`) + /// or relative to this module (e.g. the `.foo` dependency implied by `from .foo import bar`) + /// + /// - Returns an error if the query failed. + /// - Returns `Ok(None)` if the query succeeded, + /// but the dependency refers to a module that does not exist. + /// - Returns `Ok(Some(ModuleName))` if the query succeeded, + /// and the dependency refers to a module that exists. pub fn resolve_dependency( &self, db: &dyn SemanticDb, @@ -124,10 +137,13 @@ impl ModuleName { Some(Self(name)) } + /// An iterator over the components of the module name: + /// `foo.bar.baz` -> `foo`, `bar`, `baz` pub fn components(&self) -> impl DoubleEndedIterator { self.0.split('.') } + /// The name of this module's immediate parent, if it has a parent pub fn parent(&self) -> Option { let (_, parent) = self.0.rsplit_once('.')?; @@ -159,9 +175,10 @@ impl std::fmt::Display for ModuleName { #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)] pub enum ModuleKind { + /// A single-file module (e.g. `foo.py` or `foo.pyi`) Module, - /// A python package (a `__init__.py` or `__init__.pyi` file) + /// A python package (`foo/__init__.py` or `foo/__init__.pyi`) Package, } @@ -181,10 +198,12 @@ impl ModuleSearchPath { } } + /// Determine whether this is a first-party, third-party or standard-library search path pub fn kind(&self) -> ModuleSearchPathKind { self.inner.kind } + /// Return the location of the search path on the file system pub fn path(&self) -> &Path { &self.inner.path } @@ -459,6 +478,7 @@ impl ModuleResolver { } } + /// Remove a module from the inner cache pub(crate) fn remove_module(&mut self, file_id: FileId) { // No locking is required because we're holding a mutable reference to `self`. let Some((_, id)) = self.by_file.remove(&file_id) else { @@ -505,15 +525,19 @@ impl ModulePath { Self { root, file_id } } + /// The search path that was used to locate the module pub fn root(&self) -> &ModuleSearchPath { &self.root } + /// The file containing the source code for the module pub fn file(&self) -> FileId { self.file_id } } +/// Given a module name and a list of search paths in which to lookup modules, +/// attempt to resolve the module name fn resolve_name( name: &ModuleName, search_paths: &[ModuleSearchPath], @@ -635,7 +659,9 @@ enum PackageKind { /// A root package or module. E.g. `foo` in `foo.bar.baz` or just `foo`. Root, - /// A regular sub-package where the parent contains an `__init__.py`. For example `bar` in `foo.bar` when the `foo` directory contains an `__init__.py`. + /// A regular sub-package where the parent contains an `__init__.py`. + /// + /// For example, `bar` in `foo.bar` when the `foo` directory contains an `__init__.py`. Regular, /// A sub-package in a namespace package. A namespace package is a package without an `__init__.py`.