**Merge Imports** assist handles self

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

View file

@ -164,6 +164,33 @@ use std::fmt::{Display, Debug};
); );
} }
#[test]
fn merge_self1() {
check_assist(
merge_imports,
r"
use std::fmt<|>;
use std::fmt::Display;
",
r"
use std::fmt::{self, Display};
",
);
}
#[test]
fn merge_self2() {
check_assist(
merge_imports,
r"
use std::{fmt, <|>fmt::Display};
",
r"
use std::{fmt::{Display, self}};
",
);
}
#[test] #[test]
fn test_merge_nested() { fn test_merge_nested() {
check_assist( check_assist(

View file

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

View file

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