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
37 changes: 35 additions & 2 deletions crates/ide_assists/src/handlers/qualify_path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,10 @@ fn label(candidate: &ImportCandidate, import: &LocatedImport) -> String {
format!("Qualify as `{}`", import.import_path)
}
}
ImportCandidate::TraitAssocItem(_) => format!("Qualify `{}`", import.import_path),
ImportCandidate::TraitMethod(_) => format!("Qualify with cast as `{}`", import.import_path),
ImportCandidate::TraitAssocItem(_) => {
format!("Qualify with `{}`", import.import_path)
}
ImportCandidate::TraitMethod(_) => format!("Qualify with `{}`", import.import_path),
}
}

Expand Down Expand Up @@ -543,6 +545,37 @@ fn main() {
);
}

#[test]
fn associated_struct_const_unqualified() {
check_assist(
qualify_path,
r"
mod test_mod {
pub struct TestStruct {}
impl TestStruct {
const TEST_CONST: u8 = 42;
}
}

fn main() {
TEST_CONST$0
}
",
r"
mod test_mod {
pub struct TestStruct {}
impl TestStruct {
const TEST_CONST: u8 = 42;
}
}

fn main() {
test_mod::TestStruct::TEST_CONST
}
",
);
}

#[test]
fn associated_trait_function() {
check_assist(
Expand Down
6 changes: 5 additions & 1 deletion crates/ide_db/src/helpers/import_assets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,11 @@ fn path_applicable_imports(
return items_with_candidate_name
.into_iter()
.filter_map(|item| {
Some(LocatedImport::new(mod_path(item)?, item, item, mod_path(item)))
let mut mod_path = mod_path(item)?;
if let Some(assoc_item) = item_as_assoc(db, item) {
mod_path.push_segment(assoc_item.name(db)?);
}
Some(LocatedImport::new(mod_path.clone(), item, item, Some(mod_path)))
})
.collect();
}
Expand Down