language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix join_lines use_items right w/ and w/o comma

Browse source
This commit is contained in:
Alan Du 2019-01-04 22:06:36 -05:00
parent 182ec76f13
commit 19c641390d
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/ra_editor/src/typing.rs
View file

@ -188,8 +188,8 @@ fn remove_newline(
edit.delete(TextRange::from_to(prev.range().start(), node.range().end())); edit.delete(TextRange::from_to(prev.range().start(), node.range().end()));
} else if prev.kind() == COMMA && next.kind() == R_CURLY { } else if prev.kind() == COMMA && next.kind() == R_CURLY {
// Removes: comma, newline (incl. surrounding whitespace) // Removes: comma, newline (incl. surrounding whitespace)
let space = if let Some(USE_TREE) = prev.prev_sibling().map(|p| p.kind()) { let space = if let Some(left) = prev.prev_sibling() {
"" compute_ws(left, next)
} else { } else {
" " " "
}; };
@ -269,6 +269,11 @@ fn compute_ws(left: SyntaxNodeRef, right: SyntaxNodeRef) -> &'static str {
} }
match right.kind() { match right.kind() {
R_PAREN | R_BRACK => return "", R_PAREN | R_BRACK => return "",
R_CURLY => {
if let USE_TREE = left.kind() {
return "";
}
}
DOT => return "", DOT => return "",
_ => (), _ => (),
} }
@ -355,7 +360,21 @@ fn foo() {
#[test] #[test]
fn test_join_lines_use_items_right() { fn test_join_lines_use_items_right() {
// No space after the '{' // No space after the '}'
check_join_lines(
r"
use ra_syntax::{
<|> TextUnit, TextRange
};",
r"
use ra_syntax::{
<|> TextUnit, TextRange};",
);
}
#[test]
fn test_join_lines_use_items_right_comma() {
// No space after the '}'
check_join_lines( check_join_lines(
r" r"
use ra_syntax::{ use ra_syntax::{