Merge pull request #159 from sparkprime/text_block_escaping

Fix bug where escaping was still performed in text blocks

Author: sparkprime

core/desugarer.cpp

@@ -582,7 +582,9 @@ class Desugarer {
             // Nothing to do.
 
         } else if (auto *ast = dynamic_cast<LiteralString*>(ast_)) {
-            ast->value = jsonnet_string_unescape(ast->location, ast->value);
+            if (ast->tokenKind != LiteralString::BLOCK) {
+                ast->value = jsonnet_string_unescape(ast->location, ast->value);
+            }
             ast->tokenKind = LiteralString::DOUBLE;
             ast->blockIndent.clear();
 

test_suite/text_block.jsonnet

@@ -66,6 +66,14 @@ local str1 = |||
 std.assertEqual(str1, "text\n") &&
 
 
+// Escape chars
+local str1 = |||
+        \n
+    |||;
+
+std.assertEqual(str1, "\\n\n") &&
+
+
 // Blank line with trailing whitespace
 local blank_line1 = |||
         foo

test_suite/text_block.jsonnet.fmt.golden

@@ -66,6 +66,14 @@ local str1 = |||
 std.assertEqual(str1, "text\n") &&
 
 
+// Escape chars
+local str1 = |||
+        \n
+    |||;
+
+std.assertEqual(str1, "\\n\n") &&
+
+
 // Blank line with trailing whitespace
 local blank_line1 = |||
         foo