Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 14:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix PR

Browse source
This commit is contained in:
IceSentry 2020-04-13 13:59:30 -04:00
parent 2e279ca031
commit ed0eedb1dd
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,9 @@
use std::iter::successors; use std::iter::successors;
use ra_syntax::{ use ra_syntax::{
algo::{neighbor, SyntaxRewriter}, algo::{neighbor, skip_trivia_token, SyntaxRewriter},
ast::{self, edit::AstNodeEdit, make}, ast::{self, edit::AstNodeEdit, make},
AstNode, Direction, InsertPosition, NodeOrToken, SyntaxElement, T, AstNode, Direction, InsertPosition, SyntaxElement, T,
}; };
use crate::{Assist, AssistCtx, AssistId}; use crate::{Assist, AssistCtx, AssistId};
@ -72,18 +72,12 @@ fn try_merge_trees(old: &ast::UseTree, new: &ast::UseTree) -> Option<ast::UseTre
let lhs = old.split_prefix(&lhs_prefix); let lhs = old.split_prefix(&lhs_prefix);
let rhs = new.split_prefix(&rhs_prefix); let rhs = new.split_prefix(&rhs_prefix);
let mut should_insert_comma = true; let should_insert_comma = lhs
.use_tree_list()?
lhs.syntax() .r_curly_token()
.last_child() .and_then(|it| skip_trivia_token(it.prev_token()?, Direction::Prev))
.and_then(|child| child.children().last()) .map(|it| it.kind() != T![,])
.and_then(|last| last.next_sibling_or_token()) .unwrap_or(true);
.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(); let mut to_insert: Vec<SyntaxElement> = Vec::new();
if should_insert_comma { if should_insert_comma {