fix(#367): Do not add an extra space on output

Author: coreyoconnor

core/shared/src/main/scala/org/virtuslab/yaml/internal/dump/present/PresenterImpl.scala

@@ -15,10 +15,11 @@ object PresenterImpl extends Presenter {
     val stack   = new mutable.Stack[EventKind]
     val newline = System.lineSeparator()
 
-    var toplevelNode = true // toplevel node should't insert newline and increase indent
-    var indent       = 0
+    var toplevelNode           = true // toplevel node should't insert newline and increase indent
+    var indent                 = 0
+    var requirePreceedingSpace = false
 
-    def parseNode(events: List[EventKind]): List[EventKind] =
+    def parseNode(events: List[EventKind], priorContentThisLine: Boolean): List[EventKind] =
       events match {
         case head :: tail =>
           head match {
@@ -33,12 +34,15 @@ object PresenterImpl extends Presenter {
             case Scalar(value, _, NodeEventMetadata(_, tag)) =>
               insertSequencePadding()
               // todo escape string using doublequotes
+              if (priorContentThisLine) {
+                sb.append(" ")
+              }
               if (tag.contains(Tag.nullTag)) sb.append("!!null")
               else sb.append(value)
               sb.append(newline)
               tail
-            case DocumentStart(_) => parseNode(tail)
-            case DocumentEnd(_)   => parseNode(tail)
+            case DocumentStart(_) => parseNode(tail, priorContentThisLine = false)
+            case DocumentEnd(_)   => parseNode(tail, priorContentThisLine = false)
             case _                => events
           }
         case Nil => Nil
@@ -52,7 +56,7 @@ object PresenterImpl extends Presenter {
           tail
         case Scalar(value, _, _) :: tail =>
           appendKey(value)
-          val rest = parseNode(tail)
+          val rest = parseNode(tail, priorContentThisLine = true)
           parseMapping(rest)
         case _ => events
       }
@@ -65,20 +69,20 @@ object PresenterImpl extends Presenter {
           popAndDecreaseIndent()
           tail
         case _ =>
-          val rest = parseNode(events)
+          val rest = parseNode(events, priorContentThisLine = true)
           parseSequence(rest)
       }
 
     def appendKey(value: String) = {
       sb.append(" " * indent)
       sb.append(value)
-      sb.append(": ")
+      sb.append(":")
     }
 
     def insertSequencePadding() = stack.headOption match {
       case Some(_: SequenceStart) =>
         sb.append(" " * indent)
-        sb.append("- ")
+        sb.append("-")
       case _ => ()
     }
 
@@ -96,7 +100,7 @@ object PresenterImpl extends Presenter {
       stack.pop()
     }
 
-    parseNode(events.toList)
+    parseNode(events.toList, priorContentThisLine = false)
     sb.result()
   }
 }

core/shared/src/test/scala-3/org/virtuslab/yaml/BaseYamlEncoderSuite.scala

@@ -32,10 +32,10 @@ class YamlEncoderSuite extends munit.FunSuite:
     )
 
     val expected =
-      s"""- 
+      s"""-
          |  int: 1
          |  double: 1.997
-         |- 
+         |-
          |  int: 2
          |  double: 2.997
          |""".stripMargin
@@ -50,10 +50,10 @@ class YamlEncoderSuite extends munit.FunSuite:
     )
 
     val expected =
-      s"""- 
+      s"""-
          |  - 1
          |  - 2
-         |- 
+         |-
          |  - 3
          |  - 4
          |""".stripMargin
@@ -67,10 +67,10 @@ class YamlEncoderSuite extends munit.FunSuite:
     val data = Data(Nested(1, "one"), Nested(2, "two"))
 
     val expected =
-      s"""first: 
+      s"""first:
          |  a: 1
          |  b: one
-         |second: 
+         |second:
          |  a: 2
          |  b: two
          |""".stripMargin
@@ -115,9 +115,9 @@ class YamlEncoderSuite extends munit.FunSuite:
 
     val data = Person(Address("Anytown"), Seq(1, 2))
     val expected =
-      s"""address: 
+      s"""address:
          |  city: Anytown
-         |ints: 
+         |ints:
          |  - 1
          |  - 2
          |""".stripMargin
@@ -155,15 +155,15 @@ class YamlEncoderSuite extends munit.FunSuite:
       )
     )
     val expected = """version: 3.9
-                     |services: 
-                     |  web: 
+                     |services:
+                     |  web:
                      |    build: .
-                     |    ports: 
+                     |    ports:
                      |      - 5000:5000
-                     |    volumes: 
+                     |    volumes:
                      |      - .:/code
                      |      - logvolume01:/var/log
-                     |  redis: 
+                     |  redis:
                      |    image: redis:alpine
                      |""".stripMargin
 

core/shared/src/test/scala-3/org/virtuslab/yaml/NodeCreationSuite.scala

@@ -57,11 +57,11 @@ class NodeCreationSuite extends munit.FunSuite:
 
     assertEquals(
       node.asYaml,
-      """|- 
+      """|-
          |  key: value
-         |- 
+         |-
          |  key2: value2
-         |  seq: 
+         |  seq:
          |    - v1
          |    - v2
          |- standalone value

core/shared/src/test/scala/org/virtuslab/yaml/parser/ParserSuite.scala

@@ -156,7 +156,7 @@ class ParserSuite extends BaseYamlSuite {
   }
 
   test("issue 313 - parsing elipsis in plain scalar") {
-    val yaml = """|P: 
+    val yaml = """|P:
                   |  e: S...
                   |  c: N
                   |""".stripMargin
@@ -182,7 +182,7 @@ class ParserSuite extends BaseYamlSuite {
 
   test("parsing keeps order of keys") {
     val yaml = """
-                 |P: 
+                 |P:
                  |  a: 0
                  |  b: 1
                  |  c: 2
@@ -199,7 +199,7 @@ class ParserSuite extends BaseYamlSuite {
     val yaml =
       """name: John Wick
         |age: 40
-        |address: 
+        |address:
         |  - Anywhere
         |  - 12-345
         |""".stripMargin

core/shared/src/test/scala/org/virtuslab/yaml/traverse/NodeVisitorSuite.scala

@@ -28,15 +28,15 @@ class NodeVisitorSuite extends munit.FunSuite {
 
     val exptectedYaml =
       s"""version: 3.9
-         |services: 
-         |  web: 
+         |services:
+         |  web:
          |    build: .
-         |    volumes: 
+         |    volumes:
          |      - .:/code
          |      - logvolume01:/var/log
-         |    ports: 
+         |    ports:
          |      - 6000:6000
-         |  redis: 
+         |  redis:
          |    image: redis:alpine
          |""".stripMargin
 
@@ -72,15 +72,15 @@ class NodeVisitorSuite extends munit.FunSuite {
 
     val exptectedYaml =
       s"""version: 3.9
-         |services: 
-         |  web: 
+         |services:
+         |  web:
          |    build: .
-         |    volumes: 
+         |    volumes:
          |      - .:/code
          |      - logvolume01:/var/log
-         |    ports: 
+         |    ports:
          |      - 5000:5000:6000
-         |  redis: 
+         |  redis:
          |    image: redis:alpine:latest
          |""".stripMargin
 
@@ -91,10 +91,10 @@ class NodeVisitorSuite extends munit.FunSuite {
 
     val yaml =
       s"""version: "3.9"
-         |services: 
-         |  web: 
+         |services:
+         |  web:
          |    build: .
-         |    volumes: 
+         |    volumes:
          |      - .:/code
          |      - logvolume01:/var/log
          |    ports:
@@ -116,13 +116,13 @@ class NodeVisitorSuite extends munit.FunSuite {
 
     val exptectedYaml =
       s"""version: 3.9
-         |services: 
-         |  web: 
+         |services:
+         |  web:
          |    build: .
-         |    volumes: 
+         |    volumes:
          |      - .:/code
          |      - logvolume01:/var/log
-         |    ports: 
+         |    ports:
          |""".stripMargin
 
     assertEquals(modifiedYaml, exptectedYaml)