nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-04 19:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix file ID when qualifying paths; add another failing test

Browse Source
This commit is contained in:
Florian Diebold 2020-01-03 23:05:58 +01:00
parent 4545f289a9
commit def124e932
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/ra_assists/src/assists/add_missing_impl_members.rs
View File

@ -134,8 +134,9 @@ fn add_missing_impl_members_inner(
return None; return None;
} }
let file_id = ctx.frange.file_id;
let db = ctx.db; let db = ctx.db;
let file_id = ctx.frange.file_id;
let trait_file_id = trait_.source(db).file_id;
ctx.add_assist(AssistId(assist_id), label, |edit| { ctx.add_assist(AssistId(assist_id), label, |edit| {
let n_existing_items = impl_item_list.impl_items().count(); let n_existing_items = impl_item_list.impl_items().count();
@ -157,10 +158,10 @@ fn add_missing_impl_members_inner(
let items = missing_items let items = missing_items
.into_iter() .into_iter()
.map(|it| { .map(|it| {
substitute_type_params(db, hir::InFile::new(file_id.into(), it), &substs_by_param) substitute_type_params(db, hir::InFile::new(trait_file_id, it), &substs_by_param)
}) })
.map(|it| match module { .map(|it| match module {
Some(module) => qualify_paths(db, hir::InFile::new(file_id.into(), it), module), Some(module) => qualify_paths(db, hir::InFile::new(trait_file_id, it), module),
None => it, None => it,
}) })
.map(|it| match it { .map(|it| match it {
@ -259,6 +260,7 @@ fn qualify_paths<N: AstNode>(db: &impl HirDatabase, node: hir::InFile<N>, from:
match resolution { match resolution {
PathResolution::Def(def) => { PathResolution::Def(def) => {
let found_path = from.find_path(db, def)?; let found_path = from.find_path(db, def)?;
// TODO fix type arg replacements being qualified
let args = p let args = p
.segment() .segment()
.and_then(|s| s.type_arg_list()) .and_then(|s| s.type_arg_list())
@ -523,6 +525,32 @@ impl foo::Foo<u32> for S {
); );
} }
#[test]
fn test_substitute_param_no_qualify() {
// when substituting params, the substituted param should not be qualified!
check_assist(
add_missing_impl_members,
"
mod foo {
trait Foo<T> { fn foo(&self, bar: T); }
pub struct Param;
}
struct Param;
struct S;
impl foo::Foo<Param> for S { <|> }",
"
mod foo {
trait Foo<T> { fn foo(&self, bar: T); }
pub struct Param;
}
struct Param;
struct S;
impl foo::Foo<Param> for S {
<|>fn foo(&self, bar: Param) { unimplemented!() }
}",
);
}
#[test] #[test]
fn test_qualify_path_associated_item() { fn test_qualify_path_associated_item() {
check_assist( check_assist(