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

[ty] Fix relative imports in stub packages (#18132)

Browse source
This commit is contained in:
Micha Reiser 2025-05-16 15:30:10 +02:00 • committed by GitHub
parent e677cabd69
commit 1ba56b4bc6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ty_python_semantic/resources/mdtest/import/stub_packages.md
View file

@ -311,6 +311,5 @@ class YamlLoader: ...
```py ```py
import yaml import yaml
# TODO: This should not be an error reveal_type(yaml.YamlLoader) # revealed: <class 'YamlLoader'>
yaml.YamlLoader # error: [unresolved-attribute] "Type `<module 'yaml'>` has no attribute `YamlLoader`"
``` ```

14
crates/ty_python_semantic/src/module_resolver/path.rs
View file

@ -4,7 +4,6 @@ use std::fmt;
use std::sync::Arc; use std::sync::Arc;
use camino::{Utf8Path, Utf8PathBuf}; use camino::{Utf8Path, Utf8PathBuf};
use ruff_db::files::{File, FileError, system_path_to_file, vendored_path_to_file}; use ruff_db::files::{File, FileError, system_path_to_file, vendored_path_to_file};
use ruff_db::system::{System, SystemPath, SystemPathBuf}; use ruff_db::system::{System, SystemPath, SystemPathBuf};
use ruff_db::vendored::{VendoredPath, VendoredPathBuf}; use ruff_db::vendored::{VendoredPath, VendoredPathBuf};
@ -189,7 +188,18 @@ impl ModulePath {
stdlib_path_to_module_name(relative_path) stdlib_path_to_module_name(relative_path)
} else { } else {
let parent = relative_path.parent()?; let parent = relative_path.parent()?;
let parent_components = parent.components().map(|component| component.as_str()); let parent_components = parent.components().enumerate().map(|(index, component)| {
let component = component.as_str();
// For stub packages, strip the `-stubs` suffix from the first component
// because it isn't a valid module name part AND the module name is the name without the `-stubs`.
if index == 0 {
component.strip_suffix("-stubs").unwrap_or(component)
} else {
component
}
});
let skip_final_part = let skip_final_part =
relative_path.ends_with("__init__.py") || relative_path.ends_with("__init__.pyi"); relative_path.ends_with("__init__.py") || relative_path.ends_with("__init__.pyi");
if skip_final_part { if skip_final_part {