language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 05:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid module lookup for known classes when possible (#14343)

Browse source
This commit is contained in:
Micha Reiser 2024-11-14 21:24:12 +01:00 • committed by GitHub
parent a40bc6a460
commit 24cd592a1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/red_knot_python_semantic/src/types.rs
View file

@ -6,6 +6,13 @@ use itertools::Itertools;
use ruff_db::files::File; use ruff_db::files::File;
use ruff_python_ast as ast; use ruff_python_ast as ast;
pub(crate) use self::builder::{IntersectionBuilder, UnionBuilder};
pub use self::diagnostic::{TypeCheckDiagnostic, TypeCheckDiagnostics};
pub(crate) use self::display::TypeArrayDisplay;
pub(crate) use self::infer::{
infer_deferred_types, infer_definition_types, infer_expression_types, infer_scope_types,
};
use crate::module_resolver::file_to_module;
use crate::semantic_index::ast_ids::HasScopedAstId; use crate::semantic_index::ast_ids::HasScopedAstId;
use crate::semantic_index::definition::Definition; use crate::semantic_index::definition::Definition;
use crate::semantic_index::symbol::{self as symbol, ScopeId, ScopedSymbolId}; use crate::semantic_index::symbol::{self as symbol, ScopeId, ScopedSymbolId};
@ -22,13 +29,6 @@ use crate::types::mro::{ClassBase, Mro, MroError, MroIterator};
use crate::types::narrow::narrowing_constraint; use crate::types::narrow::narrowing_constraint;
use crate::{Db, FxOrderSet, Module, Program}; use crate::{Db, FxOrderSet, Module, Program};
pub(crate) use self::builder::{IntersectionBuilder, UnionBuilder};
pub use self::diagnostic::{TypeCheckDiagnostic, TypeCheckDiagnostics};
pub(crate) use self::display::TypeArrayDisplay;
pub(crate) use self::infer::{
infer_deferred_types, infer_definition_types, infer_expression_types, infer_scope_types,
};
mod builder; mod builder;
mod diagnostic; mod diagnostic;
mod display; mod display;
@ -1720,7 +1720,7 @@ impl<'db> KnownClass {
} }
} }
pub fn try_from_module(module: &Module, class_name: &str) -> Option<Self> { pub fn try_from_file(db: &dyn Db, file: File, class_name: &str) -> Option<Self> {
// Note: if this becomes hard to maintain (as rust can't ensure at compile time that all // Note: if this becomes hard to maintain (as rust can't ensure at compile time that all
// variants of `Self` are covered), we might use a macro (in-house or dependency) // variants of `Self` are covered), we might use a macro (in-house or dependency)
// See: https://stackoverflow.com/q/39070244 // See: https://stackoverflow.com/q/39070244
@ -1747,7 +1747,8 @@ impl<'db> KnownClass {
_ => return None, _ => return None,
}; };
candidate.check_module(module).then_some(candidate) let module = file_to_module(db, file)?;
candidate.check_module(&module).then_some(candidate)
} }
/// Return `true` if the module of `self` matches `module_name` /// Return `true` if the module of `self` matches `module_name`

4
crates/red_knot_python_semantic/src/types/infer.rs
View file

@ -1041,9 +1041,7 @@ impl<'db> TypeInferenceBuilder<'db> {
.node_scope(NodeWithScopeRef::Class(class_node)) .node_scope(NodeWithScopeRef::Class(class_node))
.to_scope_id(self.db, self.file); .to_scope_id(self.db, self.file);
let maybe_known_class = file_to_module(self.db, self.file) let maybe_known_class = KnownClass::try_from_file(self.db, self.file, name);
.as_ref()
.and_then(|module| KnownClass::try_from_module(module, name.as_str()));
let class = Class::new(self.db, &*name.id, body_scope, maybe_known_class); let class = Class::new(self.db, &*name.id, body_scope, maybe_known_class);
let class_ty = Type::class_literal(class); let class_ty = Type::class_literal(class);