Merge pull request #123 from disneystreaming/dfrancoeur/121-missing-c…

…omment
disneystreaming · Apr 26, 2023 · ba2b197 · ba2b197
2 parents 57fb9e7 + 469d074
commit ba2b197
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/modules/formatter/src/writer/ShapeWriter.scala b/modules/formatter/src/writer/ShapeWriter.scala
@@ -285,7 +285,7 @@ object ShapeWriter {
           members
         ) =>
       val content =
-        if (members.members.isEmpty) "{}"
+        if (members.members.isEmpty && !Comment.hasComment(members.ws0)) "{}"
         else s"{\n${indent(members.write, "\n", 4)}\n}"
       s"structure ${identifier.write}${resource.write}${mixins.write}${whitespace.write} $content"
 

diff --git a/modules/formatter/tests/src/FormatterSpec.scala b/modules/formatter/tests/src/FormatterSpec.scala
@@ -657,6 +657,26 @@ final class FormatterSpec extends munit.FunSuite {
     formatTest(src, expected)
   }
 
+  test("#121 - comment in empty structure") {
+    val src = """|$version: "2"
+                 |
+                 |namespace demo
+                 |
+                 |structure MyOpOutput {
+                 |    //hello
+                 |}
+                 |""".stripMargin
+    val expected = """|$version: "2"
+                      |
+                      |namespace demo
+                      |
+                      |structure MyOpOutput {
+                      |    // hello
+                      |}
+                      |""".stripMargin
+    formatTest(src, expected)
+  }
+
   test("format test - support inline structure") {
     val src = s"""|$$version: "2.0"
                   |