Sanitize multi-line default comment

Just as we do for explicit comment. Fixes #308
devlooped · Jun 4, 2024 · 117d4b4 · 117d4b4
1 parent 0f4352e
commit 117d4b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/ThisAssembly.Strings/Model.cs b/src/ThisAssembly.Strings/Model.cs
@@ -51,7 +51,8 @@ public static ResourceArea Load(IEnumerable<XElement> data, string rootArea)
             if (valueElement == null)
                 continue;
 
-            var comment = element.Element("comment")?.Value?
+            // Make sure we trim newlines and replace them with spaces for comments.
+            var comment = (element.Element("comment")?.Value ?? valueElement)
                 .Replace("<", "&lt;")
                 .Replace(">", "&gt;")
                 .Replace("\r\n", " ").Replace("\n", " ");

diff --git a/src/ThisAssembly.Tests/Resources.resx b/src/ThisAssembly.Tests/Resources.resx
@@ -132,4 +132,8 @@
   <data name="Named" xml:space="preserve">
     <value>Hello {first}, {last}. Should we call you {first}?</value>
   </data>
+  <data name="WithNewLine" xml:space="preserve">
+    <value>Hello, 
+World!</value>
+    </data>
 </root>