lib/generators.toPretty: Improved string printing, handling newlines

1 files changed, 27 insertions, 0 deletions

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 4fed8ef01c94..813a8e7f815f 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -450,7 +450,9 @@ runTests {
       int = 42;
       float = 0.1337;
       bool = true;
+      emptystring = "";
       string = ''fno"rd'';
+      newlinestring = "\n";
       path = /. + "/foo";
       null_ = null;
       function = x: x;
@@ -463,7 +465,9 @@ runTests {
       int = "42";
       float = "~0.133700";
       bool = "true";
+      emptystring = ''""'';
       string = ''"fno\"rd"'';
+      newlinestring = "\"\\n\"";
       path = "/foo";
       null_ = "null";
       function = "<λ>";
@@ -478,6 +482,16 @@ runTests {
     expr = mapAttrs (const (generators.toPretty { })) rec {
       list = [ 3 4 [ false ] ];
       attrs = { foo = null; bar.foo = "baz"; };
+      newlinestring = "\n";
+      multilinestring = ''
+        hello
+        there
+        test
+      '';
+      multilinestring' = ''
+        hello
+        there
+        test'';
     };
     expected = rec {
       list = ''
@@ -495,6 +509,19 @@ runTests {
           };
           foo = null;
         }'';
+      newlinestring = "''\n  \n''";
+      multilinestring = ''
+        '''
+          hello
+          there
+          test
+        ''''';
+      multilinestring' = ''
+        '''
+          hello
+          there
+          test''''';
+
     };
   };