language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-18 17:40:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

**Merge Imports** assist handles self

Browse source
This commit is contained in:
Aleksey Kladov 2020-08-12 18:49:43 +02:00
parent d583f2c46d
commit 0635458a6b
3 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/syntax/src/ast/edit.rs
View file

@ -313,10 +313,15 @@ impl ast::UseTree {
#[must_use]
pub fn split_prefix(&self, prefix: &ast::Path) -> ast::UseTree {
let suffix = match split_path_prefix(&prefix) {
Some(it) => it,
None => return self.clone(),
let suffix = if self.path().as_ref() == Some(prefix) && self.use_tree_list().is_none() {
make::path_unqualified(make::path_segment_self())
} else {
match split_path_prefix(&prefix) {
Some(it) => it,
None => return self.clone(),
}
};
let use_tree = make::use_tree(
suffix,
self.use_tree_list(),

3
crates/syntax/src/ast/make.rs
View file

@ -24,6 +24,9 @@ pub fn ty(text: &str) -> ast::Type {
pub fn path_segment(name_ref: ast::NameRef) -> ast::PathSegment {
ast_from_text(&format!("use {};", name_ref))
}
pub fn path_segment_self() -> ast::PathSegment {
ast_from_text("use self;")
}
pub fn path_unqualified(segment: ast::PathSegment) -> ast::Path {
path_from_text(&format!("use {}", segment))
}