mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-04 10:48:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix runaway execution time on dd-trace-py

Browse source
This commit is contained in:
Alex Waygood 2025-06-17 23:24:49 +01:00
parent 823f5995dc
commit aec3a7cd43
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ty_python_semantic/src/types/infer.rs
View file

@ -47,7 +47,7 @@ use salsa;
use salsa::plumbing::AsId; use salsa::plumbing::AsId;
use crate::module_name::{ModuleName, ModuleNameResolutionError}; use crate::module_name::{ModuleName, ModuleNameResolutionError};
use crate::module_resolver::resolve_module; use crate::module_resolver::{file_to_module, resolve_module};
use crate::node_key::NodeKey; use crate::node_key::NodeKey;
use crate::place::{ use crate::place::{
Boundness, LookupError, Place, PlaceAndQualifiers, builtins_module_scope, builtins_symbol, Boundness, LookupError, Place, PlaceAndQualifiers, builtins_module_scope, builtins_symbol,
@ -4451,14 +4451,31 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
); );
} }
if let Some(suggestion) = find_best_suggestion_for_unresolved_member( // Where possible, we compute a list of possible names that this might have
// been a typo for, and suggest the closest match.
//
// However, we skip attempting to compute the possible typo candidates if it's a
// self-referential import *or* any relative import in an `__init__.py` file.
// Attempting to compute the candidates in these cases causes cycles
// and runaway execution time.
if import_is_self_referential {
return;
}
if import_from.level != 0
&& file_to_module(self.db(), self.file())
.is_some_and(|module| module.kind().is_package())
{
return;
}
let Some(suggestion) = find_best_suggestion_for_unresolved_member(
self.db(), self.db(),
module_ty, module_ty,
name, name,
HideUnderscoredSuggestions::Yes, HideUnderscoredSuggestions::Yes,
) { ) else {
diagnostic.set_primary_message(format_args!("Did you mean `{suggestion}`?",)); return;
} };
diagnostic.set_primary_message(format_args!("Did you mean `{suggestion}`?"));
} }
fn infer_return_statement(&mut self, ret: &ast::StmtReturn) { fn infer_return_statement(&mut self, ret: &ast::StmtReturn) {