Don't separate multi-line manifest value introducer from colon with space in manifest serializer

3 files changed, 33 insertions, 24 deletions

diff --git a/tests/manifest-rewriter/driver.cxx b/tests/manifest-rewriter/driver.cxx
index 3e8fecb..3b1dfe9 100644
--- a/tests/manifest-rewriter/driver.cxx
+++ b/tests/manifest-rewriter/driver.cxx
@@ -67,17 +67,26 @@ namespace butl
                   {{"a", "xyz"}, edit_cmd {"x", "y", "c"}, {"e", "123"}}) ==
             ":1\na: xyz\nc:d\nx: y\ne: 123");
 
-    assert (edit (":1\na: b", {{"a", "xy\nz"}}) == ":1\na: \\\nxy\nz\n\\");
+    assert (edit (":1\na: b", {{"a", "xy\nz"}}) == ":1\na:\\\nxy\nz\n\\");
+
+    assert (edit (":1\na:\\\nxy\nz\n\\\nb: c", {{"a", "ab\ncd\ne"}}) ==
+            ":1\na:\\\nab\ncd\ne\n\\\nb: c");
+
+    assert (edit (":1\na: \\\nxy\nz\n\\\nb: c", {{"a", "ab\ncd\ne"}}) ==
+            ":1\na:\\\nab\ncd\ne\n\\\nb: c");
+
+    assert (edit (":1\na:\n\\\nxy\nz\n\\\nb: c", {{"a", "ab\ncd\ne"}}) ==
+            ":1\na:\\\nab\ncd\ne\n\\\nb: c");
 
     assert (edit (":1\n", {{"a", "b", ""}}) == ":1\na: b\n");
 
     assert (edit (":1\n                                     abc: b",
                   {{"abc", "xyz"}}) ==
-            ":1\n                                     abc: \\\nxyz\n\\");
+            ":1\n                                     abc:\\\nxyz\n\\");
 
     assert (edit (":1\n                                     a\xD0\xB0g : b",
                   {{"a\xD0\xB0g", "xyz"}}) ==
-            ":1\n                                     a\xD0\xB0g : \\\nxyz\n\\");
+            ":1\n                                     a\xD0\xB0g :\\\nxyz\n\\");
 
     // Test editing of manifests that contains CR characters.
     //
diff --git a/tests/manifest-roundtrip/manifest b/tests/manifest-roundtrip/manifest
index 23c2730..4926e29 100644
--- a/tests/manifest-roundtrip/manifest
+++ b/tests/manifest-roundtrip/manifest
@@ -7,7 +7,7 @@ tags: c++, package, manager, bpkg
 description: A very very very very very very very very very very very very\
  very very very very very very very very very very very very very very very\
  very very long description.
-changes: \
+changes:\
 1.0.1
   - Fixed a  very very very very very very very very very very very very very\
   very annoying bug.
@@ -26,7 +26,7 @@ requires: ?* linux | windows
 requires: c++11
 :
 path: c:\windows\\
-path: \
+path:\
 
 c:\windows\\
 \
diff --git a/tests/manifest-serializer/driver.cxx b/tests/manifest-serializer/driver.cxx
index 4c09038..be3ae25 100644
--- a/tests/manifest-serializer/driver.cxx
+++ b/tests/manifest-serializer/driver.cxx
@@ -189,21 +189,21 @@ main ()
   //
   string n ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   assert (test ({{"","1"},{n,"x"},{"",""},{"",""}},
-                ": 1\n" + n + ": \\\nx\n\\\n"));
+                ": 1\n" + n + ":\\\nx\n\\\n"));
   assert (test ({{"","1"},{"a","\n"},{"",""},{"",""}},
-                ": 1\na: \\\n\n\n\\\n"));
+                ": 1\na:\\\n\n\n\\\n"));
   assert (test ({{"","1"},{"a","\n\n"},{"",""},{"",""}},
-                ": 1\na: \\\n\n\n\n\\\n"));
+                ": 1\na:\\\n\n\n\n\\\n"));
   assert (test ({{"","1"},{"a","\nx\n"},{"",""},{"",""}},
-                ": 1\na: \\\n\nx\n\n\\\n"));
+                ": 1\na:\\\n\nx\n\n\\\n"));
   assert (test ({{"","1"},{"a","x\ny\nz"},{"",""},{"",""}},
-                ": 1\na: \\\nx\ny\nz\n\\\n"));
+                ": 1\na:\\\nx\ny\nz\n\\\n"));
   assert (test ({{"","1"},{"a"," x"},{"",""},{"",""}},
-                ": 1\na: \\\n x\n\\\n"));
+                ": 1\na:\\\n x\n\\\n"));
   assert (test ({{"","1"},{"a","x "},{"",""},{"",""}},
-                ": 1\na: \\\nx \n\\\n"));
+                ": 1\na:\\\nx \n\\\n"));
   assert (test ({{"","1"},{"a"," x "},{"",""},{"",""}},
-                ": 1\na: \\\n x \n\\\n"));
+                ": 1\na:\\\n x \n\\\n"));
 
   // The long lines mode.
   //
@@ -212,42 +212,42 @@ main ()
                 true /* long_lines */));
 
   assert (test ({{"","1"},{"a", " abc\n" + l1 + "\ndef"},{"",""},{"",""}},
-                ": 1\na: \\\n abc\n" + l1 + "\ndef\n\\\n",
+                ": 1\na:\\\n abc\n" + l1 + "\ndef\n\\\n",
                 true /* long_lines */));
 
   assert (test ({{"","1"},{n,l1},{"",""},{"",""}},
-                ": 1\n" + n + ": \\\n" + l1 + "\n\\\n",
+                ": 1\n" + n + ":\\\n" + l1 + "\n\\\n",
                 true /* long_lines */));
 
   // Carriage return character.
   //
   assert (test ({{"","1"},{"a","x\ry"},{"",""},{"",""}},
-                ": 1\na: \\\nx\ny\n\\\n"));
+                ": 1\na:\\\nx\ny\n\\\n"));
   assert (test ({{"","1"},{"a","x\r"},{"",""},{"",""}},
-                ": 1\na: \\\nx\n\n\\\n"));
+                ": 1\na:\\\nx\n\n\\\n"));
   assert (test ({{"","1"},{"a","x\r\ny"},{"",""},{"",""}},
-                ": 1\na: \\\nx\ny\n\\\n"));
+                ": 1\na:\\\nx\ny\n\\\n"));
   assert (test ({{"","1"},{"a","x\r\n"},{"",""},{"",""}},
-                ": 1\na: \\\nx\n\n\\\n"));
+                ": 1\na:\\\nx\n\n\\\n"));
 
   // Extra three x's are for the leading name part ("a: ") that we
   // don't have.
   //
   assert (test ({{"","1"},{"a","\nxxx" + l1},{"",""},{"",""}},
-                ": 1\na: \\\n\nxxx" + e1 + "\n\\\n"));
+                ": 1\na:\\\n\nxxx" + e1 + "\n\\\n"));
   assert (test ({{"","1"},{"a","\nxxx" + l2},{"",""},{"",""}},
-                ": 1\na: \\\n\nxxx" + e2 + "\n\\\n"));
+                ": 1\na:\\\n\nxxx" + e2 + "\n\\\n"));
   assert (test ({{"","1"},{"a","\nxxx" + l3},{"",""},{"",""}},
-                ": 1\na: \\\n\nxxx" + e3 + "\n\\\n"));
+                ": 1\na:\\\n\nxxx" + e3 + "\n\\\n"));
   assert (test ({{"","1"},{"a","\nxxx" + l4},{"",""},{"",""}},
-                ": 1\na: \\\n\nxxx" + e4 + "\n\\\n"));
+                ": 1\na:\\\n\nxxx" + e4 + "\n\\\n"));
 
   // Backslash escaping (simple and multi-line).
   //
   assert (test ({{"","1"},{"a","c:\\"},{"",""},{"",""}},
                 ": 1\na: c:\\\\\n"));
   assert (test ({{"","1"},{"a","c:\\\nd:\\"},{"",""},{"",""}},
-                ": 1\na: \\\nc:\\\\\nd:\\\\\n\\\n"));
+                ": 1\na:\\\nc:\\\\\nd:\\\\\n\\\n"));
 
   // Manifest value/comment merging.
   //