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

Avoid attributing runtime references to module-level imports (#4942)

Browse source
This commit is contained in:
Charlie Marsh 2023-06-07 17:56:03 -04:00 • committed by GitHub
parent 20240fc3d9
commit ae75b303f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 98 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ruff_python_semantic/src/model.rs
View file

@ -178,7 +178,7 @@ impl<'a> SemanticModel<'a> {
pub fn resolve_reference(&mut self, symbol: &str, range: TextRange) -> ResolvedReference {
// PEP 563 indicates that if a forward reference can be resolved in the module scope, we
// should prefer it over local resolutions.
if self.in_deferred_type_definition() {
if self.in_forward_reference() {
if let Some(binding_id) = self.scopes.global().get(symbol) {
// Mark the binding as used.
let context = self.execution_context();
@ -239,9 +239,7 @@ impl<'a> SemanticModel<'a> {
//
// The `name` in `print(name)` should be treated as unresolved, but the `name` in
// `name: str` should be treated as used.
if !self.in_deferred_type_definition()
&& self.bindings[binding_id].kind.is_annotation()
{
if !self.in_forward_reference() && self.bindings[binding_id].kind.is_annotation() {
continue;
}
@ -756,6 +754,27 @@ impl<'a> SemanticModel<'a> {
|| self.in_future_type_definition()
}
/// Return `true` if the context is in a forward type reference.
///
/// Includes deferred string types, and future types in annotations.
///
/// ## Examples
/// ```python
/// from __future__ import annotations
///
/// from threading import Thread
///
///
/// x: Thread # Forward reference
/// cast("Thread", x) # Forward reference
/// cast(Thread, x) # Non-forward reference
/// ```
pub const fn in_forward_reference(&self) -> bool {
self.in_simple_string_type_definition()
|| self.in_complex_string_type_definition()
|| (self.in_future_type_definition() && self.in_annotation())
}
/// Return `true` if the context is in an exception handler.
pub const fn in_exception_handler(&self) -> bool {
self.flags.contains(SemanticModelFlags::EXCEPTION_HANDLER)