From 1116afa7bc3adf9c4e39a0a9d141a6c0a3d38057 Mon Sep 17 00:00:00 2001
From: Dunqing <dengqing0821@gmail.com>
Date: Fri, 17 Nov 2023 14:03:26 +0800
Subject: [PATCH] fix(prettier): remove extra empty lines inside the function
 body (#1365)

I'm not sure that's the right approach. But we can handle it this way for now
---
 crates/oxc_prettier/src/format/block.rs     |  7 ++++---
 crates/oxc_prettier/src/format/function.rs  |  2 ++
 crates/oxc_prettier/src/format/mod.rs       |  2 +-
 crates/oxc_prettier/src/format/statement.rs | 18 ++++++++++++++++--
 tasks/prettier_conformance/prettier.snap.md |  3 +--
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/crates/oxc_prettier/src/format/block.rs b/crates/oxc_prettier/src/format/block.rs
index e5ad97b79..c4711b3d3 100644
--- a/crates/oxc_prettier/src/format/block.rs
+++ b/crates/oxc_prettier/src/format/block.rs
@@ -17,7 +17,7 @@ pub(super) fn print_block<'a>(
         parts.push(ss!("static "));
     }
     parts.push(ss!("{"));
-    if let Some(doc) = print_block_body(p, stmts, directives) {
+    if let Some(doc) = print_block_body(p, stmts, directives, true) {
         parts.push(indent![p, hardline!(), doc]);
         parts.push(hardline!());
     }
@@ -29,6 +29,7 @@ pub(super) fn print_block_body<'a>(
     p: &mut Prettier<'a>,
     stmts: &Vec<'a, Statement<'a>>,
     directives: Option<&Vec<'a, Directive>>,
+    remove_last_statement_hardline: bool,
 ) -> Option<Doc<'a>> {
     let has_directives = directives.is_some_and(|directives| !directives.is_empty());
     let has_body = stmts.iter().any(|stmt| !matches!(stmt, Statement::EmptyStatement(_)));
@@ -41,12 +42,12 @@ pub(super) fn print_block_body<'a>(
 
     if has_directives {
         if let Some(directives) = directives {
-            parts.extend(statement::print_statement_sequence(p, directives));
+            parts.extend(statement::print_statement_sequence(p, directives, false));
         }
     }
 
     if !stmts.is_empty() {
-        parts.extend(statement::print_statement_sequence(p, stmts));
+        parts.extend(statement::print_statement_sequence(p, stmts, remove_last_statement_hardline));
     }
 
     Some(Doc::Array(parts))
diff --git a/crates/oxc_prettier/src/format/function.rs b/crates/oxc_prettier/src/format/function.rs
index 4f257cbd2..edf9e9532 100644
--- a/crates/oxc_prettier/src/format/function.rs
+++ b/crates/oxc_prettier/src/format/function.rs
@@ -35,6 +35,8 @@ pub(super) fn print_function<'a>(p: &mut Prettier<'a>, func: &Function<'a>) -> D
         parts.push(p.str(";"));
     }
 
+    parts.push(hardline!());
+
     Doc::Array(parts)
 }
 
diff --git a/crates/oxc_prettier/src/format/mod.rs b/crates/oxc_prettier/src/format/mod.rs
index 8790e52f1..33748ac80 100644
--- a/crates/oxc_prettier/src/format/mod.rs
+++ b/crates/oxc_prettier/src/format/mod.rs
@@ -52,7 +52,7 @@ where
 
 impl<'a> Format<'a> for Program<'a> {
     fn format(&self, p: &mut Prettier<'a>) -> Doc<'a> {
-        block::print_block_body(p, &self.body, Some(&self.directives)).unwrap_or(ss!(""))
+        block::print_block_body(p, &self.body, Some(&self.directives), false).unwrap_or(ss!(""))
     }
 }
 
diff --git a/crates/oxc_prettier/src/format/statement.rs b/crates/oxc_prettier/src/format/statement.rs
index 400bbfd96..d12a6f22f 100644
--- a/crates/oxc_prettier/src/format/statement.rs
+++ b/crates/oxc_prettier/src/format/statement.rs
@@ -7,10 +7,24 @@ use super::Format;
 pub(super) fn print_statement_sequence<'a, F: Format<'a>>(
     p: &mut Prettier<'a>,
     stmts: &Vec<'a, F>,
+    remove_last_statement_hardline: bool,
 ) -> Vec<'a, Doc<'a>> {
     let mut parts = p.vec();
-    for stmt in stmts {
-        parts.push(stmt.format(p));
+    for (index, stmt) in stmts.iter().enumerate() {
+        let mut docs = stmt.format(p);
+
+        if remove_last_statement_hardline && index == stmts.len() - 1 {
+            match docs {
+                Doc::Array(ref mut docs) | Doc::Group(ref mut docs) => {
+                    if matches!(docs.last(), Some(Doc::Hardline)) {
+                        docs.pop();
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        parts.push(docs);
     }
     parts
 }
diff --git a/tasks/prettier_conformance/prettier.snap.md b/tasks/prettier_conformance/prettier.snap.md
index 7ef4c20fd..6d9dec881 100644
--- a/tasks/prettier_conformance/prettier.snap.md
+++ b/tasks/prettier_conformance/prettier.snap.md
@@ -1,4 +1,4 @@
-Compatibility: 10/173 (5.78%)
+Compatibility: 11/173 (6.36%)
 
 # Failed
 
@@ -110,7 +110,6 @@ Compatibility: 10/173 (5.78%)
 * newline
 * no-semi
 * no-semi-babylon-extensions
-* non-strict
 * nullish-coalescing
 * numeric-separators
 * object-prop-break-in