From 26b5f1f92fa50215a2b70fb5211c300d56f290f2 Mon Sep 17 00:00:00 2001
From: Chayim Refael Friedman <chayimfr@gmail.com>
Date: Sun, 4 Sep 2022 14:24:16 +0000
Subject: [PATCH] Do not insert a newline after `;` if the next token is a `}`

This creates double newline.
---
 .../ide-db/src/syntax_helpers/insert_whitespace_into_node.rs | 2 +-
 crates/ide/src/hover/tests.rs                                | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs b/crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs
index f54ae6c920..8bc093a85a 100644
--- a/crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs
+++ b/crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs
@@ -95,7 +95,7 @@ pub fn insert_ws_into(syn: SyntaxNode) -> SyntaxNode {
             AS_KW | DYN_KW | IMPL_KW | CONST_KW => {
                 mods.push(do_ws(after, tok));
             }
-            T![;] => {
+            T![;] if is_next(|it| it != R_CURLY, true) => {
                 if indent > 0 {
                     mods.push(do_indent(after, tok, indent));
                 }
diff --git a/crates/ide/src/hover/tests.rs b/crates/ide/src/hover/tests.rs
index d49bc4f99c..4b8b47783d 100644
--- a/crates/ide/src/hover/tests.rs
+++ b/crates/ide/src/hover/tests.rs
@@ -5135,7 +5135,7 @@ fn main() { $0V; }
             ```rust
             test
             ```
-            
+
             ```rust
             pub const V: i8 = {
               let e = 123;
@@ -5162,11 +5162,10 @@ fn main() { $0V; }
             ```rust
             test
             ```
-            
+
             ```rust
             pub static V: i8 = {
               let e = 123;
-              
             }
             ```
         "#]],