mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #9652

Browse Source 
9652: Don't concat path in replace_qualified assist when they start with a keyword r=Veykril a=Veykril

Also keep the path if we can't find a path to the item instead of becoming non applicable.
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-07-20 16:58:30 +00:00 committed by GitHub
commit 1c8cfa4310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
View File

@ -54,12 +54,23 @@ pub(crate) fn replace_qualified_name_with_use(
_ => return None,
};
let starts_with_name_ref = !matches!(
path.first_segment().and_then(|it| it.kind()),
Some(
ast::PathSegmentKind::CrateKw
| ast::PathSegmentKind::SuperKw
| ast::PathSegmentKind::SelfKw
)
);
let path_to_qualifier = starts_with_name_ref
.then(|| {
ctx.sema.scope(path.syntax()).module().and_then(|m| {
m.find_use_path_prefixed(ctx.sema.db, module, ctx.config.insert_use.prefix_kind)
})
})
.flatten();
let scope = ImportScope::find_insert_use_container_with_macros(path.syntax(), &ctx.sema)?;
let path_to_qualifier = ctx.sema.scope(path.syntax()).module()?.find_use_path_prefixed(
ctx.sema.db,
module,
ctx.config.insert_use.prefix_kind,
)?;
let target = path.syntax().text_range();
acc.add(
AssistId("replace_qualified_name_with_use", AssistKind::RefactorRewrite),
@ -74,7 +85,7 @@ pub(crate) fn replace_qualified_name_with_use(
ImportScope::Block(it) => ImportScope::Block(builder.make_mut(it)),
};
// stick the found import in front of the to be replaced path
let path = match mod_path_to_ast(&path_to_qualifier).qualifier() {
let path = match path_to_qualifier.and_then(|it| mod_path_to_ast(&it).qualifier()) {
Some(qualifier) => make::path_concat(qualifier, path),
None => path,
};
@ -323,7 +334,7 @@ fn replace_reuses_path_qualifier() {
replace_qualified_name_with_use,
r"
pub mod foo {
struct Foo;
pub struct Foo;
}
mod bar {
@ -338,7 +349,7 @@ fn main() {
use foo::Foo;
pub mod foo {
struct Foo;
pub struct Foo;
}
mod bar {