Skip to content
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

Add exception handler in DiagnosticResult.Message #395

Merged
merged 2 commits into from
Oct 10, 2019
Merged

Add exception handler in DiagnosticResult.Message #395

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a59f7b
Add exception handler in DiagnosticResult.Message
nxtn Dec 23, 2018
ef9e19f
Remove handler in ToString
nxtn Dec 31, 2018
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
24 changes: 11 additions & 13 deletions ...icrosoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/DiagnosticResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,14 @@ public string? Message

if (MessageFormat != null)
{
return string.Format(MessageFormat.ToString(), MessageArguments ?? EmptyArguments);
nxtn marked this conversation as resolved.
Show resolved Hide resolved
try
{
return string.Format(MessageFormat.ToString(), MessageArguments ?? EmptyArguments);
}
catch (FormatException)
{
return MessageFormat.ToString();
}
}

return null;
Expand Down Expand Up @@ -273,19 +280,10 @@ public override string ToString()
builder.Append(" ");
builder.Append(Id);

try
var message = Message;
if (message != null)
{
var message = Message;
if (message != null)
{
builder.Append(": ").Append(message);
}
}
catch (FormatException)
{
// A message format is provided without arguments, so we print the unformatted string
Debug.Assert(MessageFormat != null, $"Assertion failed: {nameof(MessageFormat)} != null");
builder.Append(": ").Append(MessageFormat);
builder.Append(": ").Append(message);
}

return builder.ToString();
Expand Down