Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix double comma when merge imports on second line

Browse source 
This fixes the a bug when merging imports from the second line when it already has a comma it would previously insert a comma.

There's probably a better way to check for a COMMA. 

This also ends up with a weird indentation, but rust-fmt can easily deal with it so I'm not sure how to resolve that.

Closes #3832
This commit is contained in:
IceSentry 2020-04-12 21:29:14 -04:00
parent c388130f5f
commit abdf725c55
1 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
crates/ra_assists/src/handlers/merge_imports.rs
View file

@ -3,7 +3,8 @@ use std::iter::successors;
use ra_syntax::{
algo::{neighbor, SyntaxRewriter},
ast::{self, edit::AstNodeEdit, make},
AstNode, Direction, InsertPosition, SyntaxElement, T,
AstNode, Direction, InsertPosition, NodeOrToken, SyntaxElement, SyntaxKind, SyntaxToken, Token,
T,
};
use crate::{Assist, AssistCtx, AssistId};
@ -72,9 +73,24 @@ fn try_merge_trees(old: &ast::UseTree, new: &ast::UseTree) -> Option<ast::UseTre
let lhs = old.split_prefix(&lhs_prefix);
let rhs = new.split_prefix(&rhs_prefix);
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() != ",";
}
});
let mut to_insert: Vec<SyntaxElement> = Vec::new();
to_insert.push(make::token(T![,]).into());
to_insert.push(make::tokens::single_space().into());
if should_insert_comma {
to_insert.push(make::token(T![,]).into());
to_insert.push(make::tokens::single_space().into());
}
to_insert.extend(
rhs.use_tree_list()?
.syntax()
@ -247,4 +263,22 @@ use {
",
);
}
#[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};
",
)
}
}