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

split_import intention correctly works with use trees

Browse Source
This commit is contained in:
Aleksey Kladov 2019-01-06 12:48:33 +03:00
parent 3e42a15878
commit bc3e732ec5
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ra_editor/src/assists/split_import.rs
View File

@ -19,7 +19,10 @@ pub fn split_import(ctx: AssistCtx) -> Option<Assist> {
}
let l_curly = colon_colon.range().end();
let r_curly = top_path.syntax().range().end();
let r_curly = match top_path.syntax().parent().and_then(ast::UseTree::cast) {
Some(tree) => tree.syntax().range().end(),
None => top_path.syntax().range().end(),
};
ctx.build("split import", |edit| {
edit.insert(l_curly, "{");
@ -41,4 +44,13 @@ fn test_split_import() {
"use crate::{<|>db::RootDatabase};",
)
}
#[test]
fn split_import_works_with_trees() {
check_assist(
split_import,
"use algo:<|>:visitor::{Visitor, visit}",
"use algo::{<|>visitor::{Visitor, visit}}",
)
}
}