2020-03-18 10:41:24 -05:00
|
|
|
use std::iter::successors;
|
|
|
|
|
2020-03-19 05:38:26 -05:00
|
|
|
use ra_syntax::{
|
2020-03-24 11:03:05 -05:00
|
|
|
algo::{neighbor, SyntaxRewriter},
|
2020-03-19 05:38:26 -05:00
|
|
|
ast::{self, edit::AstNodeEdit, make},
|
2020-04-12 20:29:14 -05:00
|
|
|
AstNode, Direction, InsertPosition, NodeOrToken, SyntaxElement, SyntaxKind, SyntaxToken, Token,
|
|
|
|
T,
|
2020-03-19 05:38:26 -05:00
|
|
|
};
|
2020-03-18 10:41:24 -05:00
|
|
|
|
|
|
|
use crate::{Assist, AssistCtx, AssistId};
|
|
|
|
|
|
|
|
// Assist: merge_imports
|
|
|
|
//
|
|
|
|
// Merges two imports with a common prefix.
|
|
|
|
//
|
|
|
|
// ```
|
|
|
|
// use std::<|>fmt::Formatter;
|
|
|
|
// use std::io;
|
|
|
|
// ```
|
|
|
|
// ->
|
|
|
|
// ```
|
|
|
|
// use std::{fmt::Formatter, io};
|
|
|
|
// ```
|
|
|
|
pub(crate) fn merge_imports(ctx: AssistCtx) -> Option<Assist> {
|
|
|
|
let tree: ast::UseTree = ctx.find_node_at_offset()?;
|
2020-03-24 11:03:05 -05:00
|
|
|
let mut rewriter = SyntaxRewriter::default();
|
|
|
|
let mut offset = ctx.frange.range.start();
|
|
|
|
|
|
|
|
if let Some(use_item) = tree.syntax().parent().and_then(ast::UseItem::cast) {
|
2020-03-19 06:18:59 -05:00
|
|
|
let (merged, to_delete) = next_prev()
|
|
|
|
.filter_map(|dir| neighbor(&use_item, dir))
|
|
|
|
.filter_map(|it| Some((it.clone(), it.use_tree()?)))
|
|
|
|
.find_map(|(use_item, use_tree)| {
|
|
|
|
Some((try_merge_trees(&tree, &use_tree)?, use_item.clone()))
|
|
|
|
})?;
|
2020-03-18 10:41:24 -05:00
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
rewriter.replace_ast(&tree, &merged);
|
|
|
|
rewriter += to_delete.remove();
|
|
|
|
|
|
|
|
if to_delete.syntax().text_range().end() < offset {
|
|
|
|
offset -= to_delete.syntax().text_range().len();
|
2020-03-18 10:41:24 -05:00
|
|
|
}
|
2020-03-19 06:18:59 -05:00
|
|
|
} else {
|
|
|
|
let (merged, to_delete) = next_prev()
|
|
|
|
.filter_map(|dir| neighbor(&tree, dir))
|
|
|
|
.find_map(|use_tree| Some((try_merge_trees(&tree, &use_tree)?, use_tree.clone())))?;
|
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
rewriter.replace_ast(&tree, &merged);
|
|
|
|
rewriter += to_delete.remove();
|
|
|
|
|
|
|
|
if to_delete.syntax().text_range().end() < offset {
|
|
|
|
offset -= to_delete.syntax().text_range().len();
|
2020-03-19 06:18:59 -05:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
ctx.add_assist(AssistId("merge_imports"), "Merge imports", |edit| {
|
2020-03-24 11:03:05 -05:00
|
|
|
edit.rewrite(rewriter);
|
|
|
|
// FIXME: we only need because our diff is imprecise
|
2020-03-18 10:41:24 -05:00
|
|
|
edit.set_cursor(offset);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2020-03-19 06:18:59 -05:00
|
|
|
fn next_prev() -> impl Iterator<Item = Direction> {
|
|
|
|
[Direction::Next, Direction::Prev].iter().copied()
|
|
|
|
}
|
|
|
|
|
2020-03-18 10:41:24 -05:00
|
|
|
fn try_merge_trees(old: &ast::UseTree, new: &ast::UseTree) -> Option<ast::UseTree> {
|
|
|
|
let lhs_path = old.path()?;
|
|
|
|
let rhs_path = new.path()?;
|
|
|
|
|
|
|
|
let (lhs_prefix, rhs_prefix) = common_prefix(&lhs_path, &rhs_path)?;
|
|
|
|
|
|
|
|
let lhs = old.split_prefix(&lhs_prefix);
|
|
|
|
let rhs = new.split_prefix(&rhs_prefix);
|
|
|
|
|
2020-04-12 20:29:14 -05:00
|
|
|
let mut should_insert_comma = true;
|
|
|
|
|
|
|
|
lhs.syntax()
|
|
|
|
.last_child()
|
|
|
|
.and_then(|child| child.children().last())
|
|
|
|
.and_then(|last| last.next_sibling_or_token())
|
|
|
|
.map(|next_sibling| {
|
|
|
|
// FIXME: there's probably a better way to check if it's a COMMA
|
|
|
|
if let NodeOrToken::Token(maybe_comma) = next_sibling {
|
|
|
|
should_insert_comma = maybe_comma.to_string() != ",";
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2020-03-18 10:41:24 -05:00
|
|
|
let mut to_insert: Vec<SyntaxElement> = Vec::new();
|
2020-04-12 20:29:14 -05:00
|
|
|
if should_insert_comma {
|
|
|
|
to_insert.push(make::token(T![,]).into());
|
|
|
|
to_insert.push(make::tokens::single_space().into());
|
|
|
|
}
|
2020-03-18 10:41:24 -05:00
|
|
|
to_insert.extend(
|
|
|
|
rhs.use_tree_list()?
|
|
|
|
.syntax()
|
|
|
|
.children_with_tokens()
|
|
|
|
.filter(|it| it.kind() != T!['{'] && it.kind() != T!['}']),
|
|
|
|
);
|
|
|
|
let use_tree_list = lhs.use_tree_list()?;
|
2020-04-10 03:27:23 -05:00
|
|
|
let pos = InsertPosition::Before(use_tree_list.r_curly_token()?.into());
|
2020-03-18 10:41:24 -05:00
|
|
|
let use_tree_list = use_tree_list.insert_children(pos, to_insert);
|
|
|
|
Some(lhs.with_use_tree_list(use_tree_list))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Path)> {
|
|
|
|
let mut res = None;
|
|
|
|
let mut lhs_curr = first_path(&lhs);
|
|
|
|
let mut rhs_curr = first_path(&rhs);
|
|
|
|
loop {
|
|
|
|
match (lhs_curr.segment(), rhs_curr.segment()) {
|
|
|
|
(Some(lhs), Some(rhs)) if lhs.syntax().text() == rhs.syntax().text() => (),
|
|
|
|
_ => break,
|
|
|
|
}
|
|
|
|
res = Some((lhs_curr.clone(), rhs_curr.clone()));
|
|
|
|
|
|
|
|
match (lhs_curr.parent_path(), rhs_curr.parent_path()) {
|
|
|
|
(Some(lhs), Some(rhs)) => {
|
|
|
|
lhs_curr = lhs;
|
|
|
|
rhs_curr = rhs;
|
|
|
|
}
|
|
|
|
_ => break,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res
|
|
|
|
}
|
|
|
|
|
|
|
|
fn first_path(path: &ast::Path) -> ast::Path {
|
|
|
|
successors(Some(path.clone()), |it| it.qualifier()).last().unwrap()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use crate::helpers::check_assist;
|
|
|
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_merge_first() {
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use std::fmt<|>::Debug;
|
|
|
|
use std::fmt::Display;
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
use std::fmt<|>::{Debug, Display};
|
|
|
|
",
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_merge_second() {
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use std::fmt::Debug;
|
|
|
|
use std::fmt<|>::Display;
|
|
|
|
",
|
|
|
|
r"
|
2020-03-24 11:03:05 -05:00
|
|
|
use std::fmt:<|>:{Display, Debug};
|
2020-03-18 10:41:24 -05:00
|
|
|
",
|
2020-03-19 06:18:59 -05:00
|
|
|
);
|
2020-03-18 10:41:24 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_merge_nested() {
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use std::{fmt<|>::Debug, fmt::Display};
|
|
|
|
",
|
|
|
|
r"
|
2020-03-19 06:18:59 -05:00
|
|
|
use std::{fmt<|>::{Debug, Display}};
|
2020-03-18 10:41:24 -05:00
|
|
|
",
|
2020-03-19 06:18:59 -05:00
|
|
|
);
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use std::{fmt::Debug, fmt<|>::Display};
|
|
|
|
",
|
|
|
|
r"
|
2020-03-24 11:03:05 -05:00
|
|
|
use std::{fmt::<|>{Display, Debug}};
|
2020-03-23 14:57:42 -05:00
|
|
|
",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-03-27 11:28:25 -05:00
|
|
|
#[test]
|
|
|
|
fn test_merge_single_wildcard_diff_prefixes() {
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use std<|>::cell::*;
|
|
|
|
use std::str;
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
use std<|>::{cell::*, str};
|
|
|
|
",
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_merge_both_wildcard_diff_prefixes() {
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use std<|>::cell::*;
|
|
|
|
use std::str::*;
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
use std<|>::{cell::*, str::*};
|
|
|
|
",
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2020-03-23 14:57:42 -05:00
|
|
|
#[test]
|
|
|
|
fn removes_just_enough_whitespace() {
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use foo<|>::bar;
|
|
|
|
use foo::baz;
|
|
|
|
|
|
|
|
/// Doc comment
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
use foo<|>::{bar, baz};
|
|
|
|
|
|
|
|
/// Doc comment
|
2020-03-24 11:03:05 -05:00
|
|
|
",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn works_with_trailing_comma() {
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use {
|
|
|
|
foo<|>::bar,
|
|
|
|
foo::baz,
|
|
|
|
};
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
use {
|
|
|
|
foo<|>::{bar, baz},
|
|
|
|
};
|
|
|
|
",
|
|
|
|
);
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use {
|
|
|
|
foo::baz,
|
|
|
|
foo<|>::bar,
|
|
|
|
};
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
use {
|
|
|
|
foo::{bar<|>, baz},
|
|
|
|
};
|
2020-03-19 06:18:59 -05:00
|
|
|
",
|
|
|
|
);
|
2020-03-18 10:41:24 -05:00
|
|
|
}
|
2020-04-12 20:29:14 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_double_comma() {
|
|
|
|
check_assist(
|
|
|
|
merge_imports,
|
|
|
|
r"
|
|
|
|
use hyper::service::make_service_fn;
|
|
|
|
use hyper::<|>{
|
|
|
|
StatusCode,
|
|
|
|
};
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
use hyper::{<|>
|
|
|
|
StatusCode,
|
|
|
|
service::make_service_fn};
|
|
|
|
",
|
|
|
|
)
|
|
|
|
}
|
2020-03-18 10:41:24 -05:00
|
|
|
}
|