Skip to content

Sanitize multi-line default comment #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kzu merged 1 commit into from
Jun 4, 2024
Merged

Sanitize multi-line default comment #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ThisAssembly.Strings/Model.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", " ");
Expand Down
4 changes: 4 additions & 0 deletions src/ThisAssembly.Tests/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>