fix: don't strip trailing comment between last node and macro closing…

… delimiter
bram209 · Feb 3, 2025 · d0cd68f · d0cd68f
1 parent e17a74f
commit d0cd68f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/formatter/src/formatter/mac.rs b/formatter/src/formatter/mac.rs
@@ -111,12 +111,12 @@ impl Formatter<'_> {
         }
 
         self.trim_whitespace(nodes.first().span().start().line - 1);
-        self.view_macro_nodes(nodes);
+        self.view_macro_nodes(nodes, view_mac.mac.span());
         self.printer.word("}");
         self.printer.end();
     }
 
-    fn view_macro_nodes(&mut self, nodes: &[Node]) {
+    fn view_macro_nodes(&mut self, nodes: &[Node], mac_span: Span) {
         self.printer.cbox_indent();
         self.printer.space();
 
@@ -130,6 +130,7 @@ impl Formatter<'_> {
         }
 
         self.printer.space();
+        self.flush_comments(mac_span.end().line - 1, true);
         self.printer.end_dedent();
     }
 }

diff --git a/formatter/src/source_file.rs b/formatter/src/source_file.rs
@@ -373,7 +373,9 @@ mod tests {
 
              // and some more
              // on the next line
-                    </div>  };
+                    </div>
+                   // trailing comment
+                    };
             }
 
             // comment after view macro
@@ -412,6 +414,7 @@ mod tests {
                 // and some more
                 // on the next line
                 </div>
+                // trailing comment
             };
         }