Fixing double quote handling in verbatim strings, re: #99

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenTranslatingConstants.cs

@@ -63,6 +63,25 @@ public void ShouldTranslateAVerbatimStringWithAnEscapedTabCharacter()
             translated.ShouldBe(@"""hello\\tthere!""");
         }
 
+        // See https://github.com/agileobjects/ReadableExpressions/issues/99
+        [Fact]
+        public void ShouldTranslateAVerbatimStringWithDoubleQuotes()
+        {
+            const string VERBATIM = @"
+12
+""1""2
+";
+            var stringConstant = Constant(VERBATIM, typeof(string));
+
+            var translated = stringConstant.ToReadableString();
+
+            translated.ShouldBe(@"@""
+12
+""""1""""2
+""");
+
+        }
+
         [Fact]
         public void ShouldTranslateABoolean()
         {
@@ -532,7 +551,7 @@ public void ShouldTranslateAStringArrayICollectionConstant()
             var arrayConstant = Constant(new[] { "Five", "Five", "Five" }, typeof(ICollection<string>));
 
             var translated = arrayConstant.ToReadableString();
-            
+
             translated.ShouldBe("(ICollection<string>)new[] { \"Five\", \"Five\", \"Five\" }");
         }
 

ReadableExpressions/Translations/ConstantTranslation.cs

@@ -14,6 +14,7 @@
     using Initialisations;
     using NetStandardPolyfills;
     using static System.Convert;
+    using static System.Environment;
     using static System.Globalization.CultureInfo;
 #if NET35
     using static Microsoft.Scripting.Ast.ExpressionType;
@@ -160,12 +161,14 @@ private static bool TryTranslateFromTypeCode(
                     return true;
 
                 case NetStandardTypeCode.String:
-                    var stringValue = ((string)constant.Value)
-                        .Replace(@"\", @"\\")
-                        .Replace("\0", @"\0")
-                        .Replace(@"""", @"\""");
-
+                    var stringValue = GetStringConstant(constant, out var isVerbatim);
                     stringValue = "\"" + stringValue + "\"";
+
+                    if (isVerbatim)
+                    {
+                        stringValue = "@" + stringValue;
+                    }
+
                     translation = FixedValueTranslation(stringValue, typeof(string), Text, context);
                     return true;
             }
@@ -213,6 +216,13 @@ private static ITranslation GetDoubleTranslation(
             return FixedValueTranslation(stringValue + "d", constant.Type, Numeric, context);
         }
 
+        private static ITranslation GetLongTranslation(
+            ConstantExpression constant,
+            ITranslationContext context)
+        {
+            return FixedValueTranslation((long)constant.Value + "L", constant.Type, Numeric, context);
+        }
+
         private static ITranslation GetFloatTranslation(
             ConstantExpression constant,
             ITranslationContext context)
@@ -226,11 +236,17 @@ private static ITranslation GetFloatTranslation(
             return FixedValueTranslation(stringValue + "f", constant.Type, Numeric, context);
         }
 
-        private static ITranslation GetLongTranslation(
+        private static string GetStringConstant(
             ConstantExpression constant,
-            ITranslationContext context)
+            out bool isVerbatim)
         {
-            return FixedValueTranslation((long)constant.Value + "L", constant.Type, Numeric, context);
+            var stringValue = (string)constant.Value;
+            isVerbatim = stringValue.Contains(NewLine);
+
+            return stringValue
+                .Replace(@"\", @"\\")
+                .Replace("\0", @"\0")
+                .Replace(@"""", isVerbatim ? @"""""" : @"\""");
         }
 
         private static bool TryGetTypeTranslation(