Skip to content

LoggingSourceGenerator - Fixes InvalidCastException when using other attributes #67179

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
maryamariyan merged 1 commit into from
Mar 26, 2022
Merged

LoggingSourceGenerator - Fixes InvalidCastException when using other attributes #67179

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
11 changes: 8 additions & 3 deletions src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,20 @@ public IReadOnlyList<LoggerClass> GetLogClasses(IEnumerable<ClassDeclarationSynt
}

bool hasMisconfiguredInput = false;
ImmutableArray<AttributeData>? boundAttrbutes = logMethodSymbol?.GetAttributes();
ImmutableArray<AttributeData>? boundAttributes = logMethodSymbol?.GetAttributes();

if (boundAttrbutes == null)
if (boundAttributes == null || boundAttributes!.Value.Length == 0)
Copy link
Member

@eerhardt eerhardt Mar 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you need a ! here? You just checked it for null on the same line.

{
continue;
}

foreach (AttributeData attributeData in boundAttrbutes)
foreach (AttributeData attributeData in boundAttributes)
{
if (attributeData.AttributeClass?.Equals(loggerMessageAttribute) != true)
{
continue;
}

// supports: [LoggerMessage(0, LogLevel.Warning, "custom message")]
// supports: [LoggerMessage(eventId: 0, level: LogLevel.Warning, message: "custom message")]
if (attributeData.ConstructorArguments.Any())
Expand Down
15 changes: 15 additions & 0 deletions .../tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@ namespace Microsoft.Extensions.Logging.Generators.Tests
[ActiveIssue("https://github.com/dotnet/runtime/issues/52062", TestPlatforms.Browser)]
public class LoggerMessageGeneratorParserTests
{
[Fact]
public async Task Valid_AdditionalAttributes()
{
Assert.Empty(await RunGenerator($@"
using System.Diagnostics.CodeAnalysis;
partial class C
{{
[SuppressMessage(""CATEGORY1"", ""SOMEID1"")]
[LoggerMessage(EventId = 0, Level = LogLevel.Debug, Message = ""M1"")]
[SuppressMessage(""CATEGORY2"", ""SOMEID2"")]
static partial void M1(ILogger logger);
}}
"));
}

[Fact]
public async Task InvalidMethodName()
{
Expand Down