fix(codegen): print statements when block is empty

part of #7190
oxc-project · Nov 11, 2024 · 2412ee8 · 2412ee8
1 parent 0d6a66a
commit 2412ee8
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 1 deletion.
diff --git a/crates/oxc_codegen/src/gen.rs b/crates/oxc_codegen/src/gen.rs
@@ -48,6 +48,8 @@ impl<'a> Gen for Program<'a> {
             stmt.print(p, ctx);
             p.print_semicolon_if_needed();
         }
+        // Print trailing statement comments.
+        p.print_statement_comments(self.span.end);
     }
 }
 
@@ -662,14 +664,27 @@ impl<'a> Gen for Function<'a> {
 
 impl<'a> Gen for FunctionBody<'a> {
     fn gen(&self, p: &mut Codegen, ctx: Context) {
-        p.print_curly_braces(self.span, self.is_empty(), |p| {
+        let is_empty = if self.is_empty() {
+            if self.span.end == 0 {
+                true
+            } else {
+                !p.comments.contains_key(&(self.span.end - 1))
+            }
+        } else {
+            false
+        };
+        p.print_curly_braces(self.span, is_empty, |p| {
             for directive in &self.directives {
                 directive.print(p, ctx);
             }
             for stmt in &self.statements {
                 p.print_semicolon_if_needed();
                 stmt.print(p, ctx);
             }
+            // Print trailing statement comments.
+            if self.span.end != 0 {
+                p.print_statement_comments(self.span.end - 1);
+            }
         });
         p.needs_semicolon = false;
     }

diff --git a/crates/oxc_codegen/tests/integration/legal_comments.rs b/crates/oxc_codegen/tests/integration/legal_comments.rs
@@ -17,6 +17,23 @@ fn cases() -> Vec<&'static str> {
     bar;
 }",
         "function bar() { var foo; /*! #__NO_SIDE_EFFECTS__ */ function () { } }",
+        "function foo() {
+	(() => {
+		/**
+		 * @preserve
+		 */
+	})();
+	/**
+	 * @preserve
+	 */
+}
+/**
+ * @preserve
+ */",
+        "/**
+* @preserve
+*/
+",
     ]
 }
 

diff --git a/crates/oxc_codegen/tests/integration/snapshots/legal_eof_comments.snap b/crates/oxc_codegen/tests/integration/snapshots/legal_eof_comments.snap
@@ -76,3 +76,41 @@ function bar() {
 	function() {}
 }
 /*! #__NO_SIDE_EFFECTS__ */
+
+########## 7
+function foo() {
+	(() => {
+		/**
+		 * @preserve
+		 */
+	})();
+	/**
+	 * @preserve
+	 */
+}
+/**
+ * @preserve
+ */
+----------
+function foo() {
+	(() => {
+		/**
+		* @preserve
+		*/
+	})();
+	/**
+	* @preserve
+	*/
+}
+/**
+* @preserve
+*/
+########## 8
+/**
+* @preserve
+*/
+
+----------
+/**
+* @preserve
+*/
diff --git a/crates/oxc_codegen/tests/integration/snapshots/legal_inline_comments.snap b/crates/oxc_codegen/tests/integration/snapshots/legal_inline_comments.snap
@@ -75,3 +75,41 @@ function bar() {
 	var foo;
 	/*! #__NO_SIDE_EFFECTS__ */ function() {}
 }
+
+########## 7
+function foo() {
+	(() => {
+		/**
+		 * @preserve
+		 */
+	})();
+	/**
+	 * @preserve
+	 */
+}
+/**
+ * @preserve
+ */
+----------
+function foo() {
+	(() => {
+		/**
+		* @preserve
+		*/
+	})();
+	/**
+	* @preserve
+	*/
+}
+/**
+* @preserve
+*/
+########## 8
+/**
+* @preserve
+*/
+
+----------
+/**
+* @preserve
+*/
diff --git a/crates/oxc_codegen/tests/integration/snapshots/legal_linked_comments.snap b/crates/oxc_codegen/tests/integration/snapshots/legal_linked_comments.snap
@@ -62,3 +62,41 @@ function bar() {
 	function() {}
 }
 /*! For license information please see test.js */
+########## 7
+function foo() {
+	(() => {
+		/**
+		 * @preserve
+		 */
+	})();
+	/**
+	 * @preserve
+	 */
+}
+/**
+ * @preserve
+ */
+----------
+function foo() {
+	(() => {
+		/**
+		* @preserve
+		*/
+	})();
+	/**
+	* @preserve
+	*/
+}
+/**
+* @preserve
+*//*! For license information please see test.js */
+########## 8
+/**
+* @preserve
+*/
+
+----------
+/**
+* @preserve
+*/
+/*! For license information please see test.js */