Update Scaffolding to escape a string containing newlines as a verbat…

…im string.
dotnet · Apr 13, 2017 · cdd23ff · cdd23ff
1 parent 0748e3e
commit cdd23ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/EFCore.Relational.Design/Internal/CSharpUtilities.cs b/src/EFCore.Relational.Design/Internal/CSharpUtilities.cs
@@ -118,7 +118,9 @@ public virtual string DelimitString([NotNull] string value)
         {
             Check.NotNull(value, nameof(value));
 
-            return "\"" + EscapeString(value) + "\"";
+            return value.Contains(Environment.NewLine)
+                ? "@\"" + EscapeVerbatimString(value) + "\""
+                : "\"" + EscapeString(value) + "\"";
         }
 
         /// <summary>

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpUtilitiesTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpUtilitiesTest.cs
@@ -23,5 +23,15 @@ public void GetTypeName(Type type, string typeName)
         }
 
         struct SomeGenericStruct<T> {}
+
+        [Theory]
+        [InlineData("", "\"\"")]
+        [InlineData("SomeValue", "\"SomeValue\"")]
+        [InlineData("Contains\\Backslash\"QuoteAnd\tTab", "\"Contains\\\\Backslash\\\"QuoteAnd\\tTab\"")]
+        [InlineData("Contains\r\nNewlinesAnd\"Quotes", "@\"Contains\r\nNewlinesAnd\"\"Quotes\"")]
+        public void DelimitString(string input, string expectedOutput)
+        {
+            Assert.Equal(expectedOutput, new CSharpUtilities().DelimitString(input));
+        }
     }
 }