mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Properly handle turbofishes in qualifiers

Browse source
This commit is contained in:
Kirill Bulatov 2021-02-28 09:57:54 +02:00
parent d386481fac
commit 9482353fa8
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/hir_def/src/path.rs
View file

@ -44,6 +44,10 @@ pub enum ImportAlias {
}
impl ModPath {
pub fn from_src_unhygienic(path: ast::Path) -> Option<ModPath> {
lower::lower_path(path, &Hygiene::new_unhygienic()).map(|it| it.mod_path)
}
pub fn from_src(path: ast::Path, hygiene: &Hygiene) -> Option<ModPath> {
lower::lower_path(path, hygiene).map(|it| it.mod_path)
}

2
crates/ide_assists/src/handlers/auto_import.rs
View file

@ -242,7 +242,7 @@ mod tests {
}
",
r"
use PubMod3::PubStruct;
use PubMod1::PubStruct;
PubStruct

2
crates/ide_assists/src/handlers/qualify_path.rs
View file

@ -313,7 +313,7 @@ mod tests {
}
",
r"
PubMod3::PubStruct
PubMod1::PubStruct
pub mod PubMod1 {
pub struct PubStruct;

2
crates/ide_completion/src/completions/flyimport.rs
View file

@ -669,8 +669,8 @@ fn main() {
}
"#,
expect![[r#"
ct SPECIAL_CONST (dep::test_mod::TestTrait) DEPRECATED
fn weird_function() (dep::test_mod::TestTrait) -> () DEPRECATED
ct SPECIAL_CONST (dep::test_mod::TestTrait) DEPRECATED
"#]],
);
}

12
crates/ide_db/src/helpers/import_assets.rs
View file

@ -43,7 +43,7 @@ pub struct PathImportCandidate {
#[derive(Debug)]
pub enum Qualifier {
Absent,
FirstSegmentUnresolved(ast::PathSegment, ast::Path),
FirstSegmentUnresolved(ast::NameRef, ModPath),
}
#[derive(Debug)]
@ -297,8 +297,7 @@ fn path_applicable_imports(
Qualifier::FirstSegmentUnresolved(first_segment, qualifier) => (first_segment, qualifier),
};
// TODO kb need to remove turbofish from the qualifier, maybe use the segments instead?
// TODO kb sorting is changed now, return back?
// TODO kb zz.syntax().ast_node() <- two options are now proposed despite the trait being imported
let unresolved_qualifier_string = unresolved_qualifier.to_string();
let unresolved_first_segment_string = unresolved_first_segment.to_string();
@ -525,12 +524,15 @@ fn path_import_candidate(
Some(qualifier) => match sema.resolve_path(&qualifier) {
None => {
let qualifier_start =
qualifier.syntax().descendants().find_map(ast::PathSegment::cast)?;
qualifier.syntax().descendants().find_map(ast::NameRef::cast)?;
let qualifier_start_path =
qualifier_start.syntax().ancestors().find_map(ast::Path::cast)?;
if sema.resolve_path(&qualifier_start_path).is_none() {
ImportCandidate::Path(PathImportCandidate {
qualifier: Qualifier::FirstSegmentUnresolved(qualifier_start, qualifier),
qualifier: Qualifier::FirstSegmentUnresolved(
qualifier_start,
ModPath::from_src_unhygienic(qualifier)?,
),
name,
})
} else {