Use verbatim literals for multi-line strings

Author: AndriySvyryd

src/CSharpScriptSerializer/LiteralCSScriptSerializer.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Scripting.Hosting;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Scripting.Hosting;
 
 namespace CSharpScriptSerialization
 {
@@ -30,7 +32,13 @@ public override ExpressionSyntax GetCreation(object obj)
                 {typeof(float), x => SyntaxFactory.Literal((float)x)},
                 {typeof(int), x => SyntaxFactory.Literal((int)x)},
                 {typeof(long), x => SyntaxFactory.Literal((long)x)},
-                {typeof(string), x => SyntaxFactory.Literal((string)x)},
+                {
+                    typeof(string), x => SyntaxFactory.Literal(
+                        SyntaxTriviaList.Empty,
+                        CSharpObjectFormatter.Instance.FormatObject(x, new PrintOptions {EscapeNonPrintableCharacters = false}),
+                        (string)x,
+                        SyntaxTriviaList.Empty)
+                },
                 {typeof(uint), x => SyntaxFactory.Literal((uint)x)},
                 {typeof(ulong), x => SyntaxFactory.Literal((ulong)x)},
                 {typeof(short), x => SyntaxFactory.Literal((short)x)},

src/CSharpScriptSerializer/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-*",
+  "version": "1.1.1-*",
   "name": "CSharpScriptSerializer",
   "title": "CSharpScriptSerializer",
   "description": "Serialize to C# scripts",
@@ -9,7 +9,7 @@
   "packOptions": {
     "tags": [ "Roslyn", "CSharp", "C#", "CSX", "Script", "Serialization" ],
     "owners": [ "Andriy.Svyryd" ],
-    "releaseNotes": "Version 1.1.0\r\n* Enable customizing the property serialization condition in PropertyCSScriptSerializer\r\nVersion 1.0.0\r\n* Enable customizing the default values in PropertyCSScriptSerializer\r\n* Change ICSScriptSerializable.GetSerializer() to return ICSScriptSerializer\r\n* Fix parameters not being used in DeserializeAsync\r\n\r\nVersion 1.0.0-alpha1\r\n* Initial release",
+    "releaseNotes": "Version 1.1.1\r\n* Use verbatim literals for multi-line strings\r\n* Remove redundant flags enum values\r\nVersion 1.1.0\r\n* Enable customizing the property serialization condition in PropertyCSScriptSerializer\r\nVersion 1.0.0\r\n* Enable customizing the default values in PropertyCSScriptSerializer\r\n* Change ICSScriptSerializable.GetSerializer() to return ICSScriptSerializer\r\n* Fix parameters not being used in DeserializeAsync\r\n\r\nVersion 1.0.0-alpha1\r\n* Initial release",
     "projectUrl": "https://github.com/AndriySvyryd/CSharpScriptSerializer",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
     "requireLicenseAcceptance": false,

test/CSharpScriptSerializer.Tests/RoundTrippingTest.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Xunit;
 
 namespace CSharpScriptSerialization.Tests
@@ -165,6 +164,25 @@ public void Combined_flag_enum()
                 + typeof(RoundtrippingTest).Name + "." + typeof(FlagsEnum).Name + "." + FlagsEnum.SecondAndThird, script);
         }
 
+        [Fact]
+        public void VerbatimStrings()
+        {
+            ValidateStringLiteral("\r", verbatim: true);
+            ValidateStringLiteral("\n", verbatim: true);
+            ValidateStringLiteral("\"", verbatim: false);
+            ValidateStringLiteral("@", verbatim: false);
+            ValidateStringLiteral("A", verbatim: false);
+        }
+
+        private void ValidateStringLiteral(string input, bool verbatim)
+        {
+            var script = CSScriptSerializer.Serialize(input);
+            Assert.Equal(verbatim ? '@' : '"', script[0]);
+
+            var output = CSScriptSerializer.Deserialize<string>(script);
+            Assert.Equal(input, output);
+        }
+
         [Fact]
         public void Self_referencing_type()
         {

test/CSharpScriptSerializer.Tests/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-*",
+  "version": "1.1.1-*",
 
   "buildOptions": {
     "warningsAsErrors": true
@@ -8,7 +8,7 @@
   "testRunner": "xunit",
 
   "dependencies": {
-    "CSharpScriptSerializer": "1.1.0-*",
+    "CSharpScriptSerializer": "1.1.1-*",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "xunit": "2.2.0-beta4-build3444"
   },