Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ private void GenStruct(LoggerMethod lm, string nestedIndentation)
");
GenVariableAssignments(lm, nestedIndentation);
_builder.Append($@"
{nestedIndentation}return $""{lm.Message}"";
{nestedIndentation}return $""{ConvertEndOfLineAndQuotationCharactersToEscapeForm(lm.Message)}"";
{nestedIndentation}}}
");
_builder.Append($@"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,14 @@ public void MessageTests()
Assert.Equal(LogLevel.Trace, logger.LastLogLevel);
Assert.Equal(6, logger.LastEventId.Id);
Assert.Equal(1, logger.CallCount);

logger.Reset();
MessageTestExtensions.M7(logger, LogLevel.Trace, "p", "q");
Assert.Null(logger.LastException);
Assert.Equal("\"p\" -> \"q\"", logger.LastFormattedString);
Assert.Equal(LogLevel.Trace, logger.LastLogLevel);
Assert.Equal(7, logger.LastEventId.Id);
Assert.Equal(1, logger.CallCount);
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@ internal static partial class MessageTestExtensions

[LoggerMessage(EventId = 6, Message = "")]
public static partial void M6(ILogger logger, LogLevel level);

[LoggerMessage(EventId = 7, Message = "\"{Value1}\" -> \"{Value2}\"")]
public static partial void M7(ILogger logger, LogLevel logLevel, string value1, string value2);
}
}