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

Refactor ast_ids traits to take ScopeId instead of VfsFile plus FileScopeId. (#12139)

Browse source
This commit is contained in:
Micha Reiser 2024-07-01 15:50:07 +02:00 • committed by GitHub
parent 5677614079
commit 955138b74a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 38 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/red_knot_python_semantic/src/semantic_model.rs
View file

@ -45,9 +45,10 @@ impl HasTy for ast::ExpressionRef<'_> {
fn ty<'db>(&self, model: &SemanticModel<'db>) -> Type<'db> {
let index = semantic_index(model.db, model.file);
let file_scope = index.expression_scope_id(*self);
let expression_id = self.scoped_ast_id(model.db, model.file, file_scope);
let scope = file_scope.to_scope_id(model.db, model.file);
let expression_id = self.scoped_ast_id(model.db, scope);
infer_types(model.db, scope).expression_ty(expression_id)
}
}
@ -152,8 +153,7 @@ impl HasTy for ast::StmtFunctionDef {
let scope = parent_scope_id.to_scope_id(model.db, model.file);
let types = infer_types(model.db, scope);
let definition =
Definition::FunctionDef(self.scoped_ast_id(model.db, model.file, parent_scope_id));
let definition = Definition::FunctionDef(self.scoped_ast_id(model.db, scope));
types.definition_ty(definition)
}
@ -175,8 +175,7 @@ impl HasTy for StmtClassDef {
let scope = parent_scope_id.to_scope_id(model.db, model.file);
let types = infer_types(model.db, scope);
let definition =
Definition::ClassDef(self.scoped_ast_id(model.db, model.file, parent_scope_id));
let definition = Definition::ClassDef(self.scoped_ast_id(model.db, scope));
types.definition_ty(definition)
}