Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions crates/ty_ide/src/goto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ use std::borrow::Cow;

use crate::find_node::covering_node;
use crate::stub_mapping::StubMapper;
use ruff_db::files::FileRange;
use ruff_db::parsed::ParsedModuleRef;
use ruff_python_ast::{self as ast, AnyNodeRef};
use ruff_python_parser::TokenKind;
use ruff_text_size::{Ranged, TextRange, TextSize};
use ty_python_semantic::ImportAliasResolution;
use ty_python_semantic::ResolvedDefinition;
use ty_python_semantic::types::Type;
use ty_python_semantic::types::definitions_for_keyword_argument;
use ty_python_semantic::{
Expand Down Expand Up @@ -258,15 +260,15 @@ impl GotoTarget<'_> {
let target_module_name = components[..=*component_index].join(".");

// Try to resolve the module
resolve_module_to_navigation_target(db, &target_module_name)
resolve_module_to_navigation_target(db, stub_mapper, &target_module_name)
}

// Handle import aliases (offset within 'z' in "import x.y as z")
GotoTarget::ImportModuleAlias { alias } => {
if alias_resolution == ImportAliasResolution::ResolveAliases {
let full_module_name = alias.name.as_str();
// Try to resolve the module
resolve_module_to_navigation_target(db, full_module_name)
resolve_module_to_navigation_target(db, stub_mapper, full_module_name)
} else {
let alias_range = alias.asname.as_ref().unwrap().range;
Some(crate::NavigationTargets::single(NavigationTarget {
Expand Down Expand Up @@ -653,16 +655,19 @@ pub(crate) fn find_goto_target(
/// Helper function to resolve a module name and create a navigation target.
fn resolve_module_to_navigation_target(
db: &dyn crate::Db,
stub_mapper: Option<&StubMapper>,
module_name_str: &str,
) -> Option<crate::NavigationTargets> {
use ty_python_semantic::{ModuleName, resolve_module};

if let Some(module_name) = ModuleName::new(module_name_str) {
if let Some(resolved_module) = resolve_module(db, &module_name) {
if let Some(module_file) = resolved_module.file(db) {
return Some(crate::NavigationTargets::single(
crate::NavigationTarget::new(module_file, TextRange::default()),
));
let definitions = vec![ResolvedDefinition::FileWithRange(FileRange::new(
module_file,
TextRange::default(),
))];
return definitions_to_navigation_targets(db, stub_mapper, definitions);
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions crates/ty_ide/src/goto_definition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,22 @@ def my_function(): ...
)
.build();

assert_snapshot!(test.goto_definition(), @r"
assert_snapshot!(test.goto_definition(), @r#"
info[goto-definition]: Definition
--> mymodule.pyi:1:1
--> mymodule.py:1:1
|
1 |
| ^
2 | def my_function(): ...
2 | def my_function():
3 | return "hello"
|
info: Source
--> main.py:2:6
|
2 | from mymodule import my_function
| ^^^^^^^^
|
");
"#);
}

/// goto-definition on a module ref should go to the .py not the .pyi
Expand Down
Loading