From f47f58ffe5fb494c883ec4fd120cdd63ad31cc68 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 24 Aug 2018 00:13:16 +0300 Subject: better join-lines --- crates/libeditor/src/typing.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crates/libeditor/src/typing.rs') diff --git a/crates/libeditor/src/typing.rs b/crates/libeditor/src/typing.rs index 918f2325c..04021d164 100644 --- a/crates/libeditor/src/typing.rs +++ b/crates/libeditor/src/typing.rs @@ -72,9 +72,11 @@ fn remove_newline( if node.kind() == WHITESPACE && node_text.bytes().filter(|&b| b == b'\n').count() == 1 { match (node.prev_sibling(), node.next_sibling()) { (Some(prev), Some(next)) => { + let range = TextRange::from_to(prev.range().start(), node.range().end()); if prev.kind() == COMMA && (next.kind() == R_PAREN || next.kind() == R_BRACK) { - let range = TextRange::from_to(prev.range().start(), node.range().end()); edit.delete(range); + } else if prev.kind() == COMMA && next.kind() == R_CURLY { + edit.replace(range, " ".to_string()); } else { edit.replace( node.range(), -- cgit v1.2.3