Cyclic0007/ruff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ty] Fix panic when attempting to validate the members of a protocol that inherits from a protocol in another module (#20956)

Browse Source
This commit is contained in:
Alex Waygood
2025-10-18 15:01:46 +01:00
committed by GitHub
parent 16efe53a72
commit 68c1fa86c8
4 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ty_python_semantic/src/types/infer/builder.rs
View File

@@ -932,7 +932,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
}
if let Some(protocol) = class.into_protocol_class(self.db()) {
protocol.validate_members(&self.context, self.index);
protocol.validate_members(&self.context);
}
}
}

11
crates/ty_python_semantic/src/types/protocol_class.rs
View File

@@ -10,9 +10,7 @@ use crate::types::TypeContext;
use crate::{
Db, FxOrderSet,
place::{Definedness, Place, PlaceAndQualifiers, place_from_bindings, place_from_declarations},
semantic_index::{
SemanticIndex, definition::Definition, place::ScopedPlaceId, place_table, use_def_map,
},
semantic_index::{definition::Definition, place::ScopedPlaceId, place_table, use_def_map},
types::{
ApplyTypeMappingVisitor, BoundTypeVarInstance, CallableType, ClassBase, ClassLiteral,
ClassType, FindLegacyTypeVarsVisitor, HasRelationToVisitor,
@@ -77,11 +75,11 @@ impl<'db> ProtocolClass<'db> {
/// Iterate through the body of the protocol class. Check that all definitions
/// in the protocol class body are either explicitly declared directly in the
/// class body, or are declared in a superclass of the protocol class.
pub(super) fn validate_members(self, context: &InferContext, index: &SemanticIndex<'db>) {
pub(super) fn validate_members(self, context: &InferContext) {
let db = context.db();
let interface = self.interface(db);
let body_scope = self.class_literal(db).0.body_scope(db);
let class_place_table = index.place_table(body_scope.file_scope_id(db));
let class_place_table = place_table(db, body_scope);
for (symbol_id, mut bindings_iterator) in
use_def_map(db, body_scope).all_end_of_scope_symbol_bindings()
@@ -104,8 +102,7 @@ impl<'db> ProtocolClass<'db> {
};
!place_from_declarations(
db,
index
.use_def_map(superclass_scope.file_scope_id(db))
use_def_map(db, superclass_scope)
.end_of_scope_declarations(ScopedPlaceId::Symbol(scoped_symbol_id)),
)
.into_place_and_conflicting_declarations()