Skip to content

#33: Fixed extracting log call location for member accessors inside the classes #34

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
stbychkov merged 1 commit into from
Jul 4, 2026
Merged

#33: Fixed extracting log call location for member accessors inside the classes #34

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
19 changes: 15 additions & 4 deletions src/AutoLoggerMessageGenerator/Mappers/CallLocationMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ internal static class CallLocationMapper
{
public static CallLocation? Map(SemanticModel semanticModel, InvocationExpressionSyntax invocationExpression)
{
var memberAccessExpression = invocationExpression.Expression as MemberAccessExpressionSyntax;
if (memberAccessExpression?.Expression is not IdentifierNameSyntax identifierName)
var identifierName = GetIdentifierName(invocationExpression);
if (identifierName is null)
return null;

var skipSymbols = identifierName.Identifier.ValueText.Length + 1; // obj accessor + dot symbol
Expand All @@ -37,7 +37,18 @@ internal static class CallLocationMapper
return new CallLocation(filePath, line, character, interceptableLocation, location);
}

#if PATH_BASED_INTERCEPTORS
private static SimpleNameSyntax? GetIdentifierName(InvocationExpressionSyntax invocationExpression)
{
var memberAccessExpression = invocationExpression.Expression as MemberAccessExpressionSyntax;
return memberAccessExpression?.Expression switch
{
IdentifierNameSyntax i => i,
MemberAccessExpressionSyntax ma => ma.Name,
_ => null
};
}

#if PATH_BASED_INTERCEPTORS
private static string GeneratePathBasedInterceptableLocation(string filePath, int line, int character)
{
return $"[{Constants.InterceptorNamespace}.{Constants.InterceptorAttributeName}(" +
Expand All @@ -46,5 +57,5 @@ private static string GeneratePathBasedInterceptableLocation(string filePath, in
$"character: {character}" +
$")]";
}
#endif
#endif
}
45 changes: 45 additions & 0 deletions tests/AutoLoggerMessageGenerator.UnitTests/Extractors/LocationContextExtractorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,49 @@ class Foo
await Assert.That(className).IsEqualTo("Foo");
await Assert.That(methodName).IsEqualTo(string.Empty);
}

[Test]
public async Task Extract_WithMemberAccessModifier_ShouldReturnExpectedNamespaceAndClassName()
{
const string additionalDeclaration = """
class Foo
{
private ILogger logger;
private void Bar() => this.logger.LogInformation("Hello world");
}
""";
var (_, syntaxTree) = await CompileSourceCode(string.Empty, additionalDeclaration);
var (invocationExpression, _, _) = FindMethodInvocation(null, syntaxTree);

var (ns, className, methodName) = LocationContextExtractor.Extract(invocationExpression);

await Assert.That(ns).IsEqualTo(Namespace);
await Assert.That(className).IsEqualTo("Foo");
await Assert.That(methodName).IsEqualTo("Bar");
}

[Test]
public async Task Extract_WithNestedMemberAccessModifier_ShouldReturnExpectedNamespaceAndClassName()
{
const string additionalDeclaration = """
class Outer
{
private readonly Foo foo;
class Foo
{
public ILogger logger;
}

private void Bar() => this.foo.logger.LogInformation("Hello world");
}
""";
var (_, syntaxTree) = await CompileSourceCode(string.Empty, additionalDeclaration);
var (invocationExpression, _, _) = FindMethodInvocation(null, syntaxTree);

var (ns, className, methodName) = LocationContextExtractor.Extract(invocationExpression);

await Assert.That(ns).IsEqualTo(Namespace);
await Assert.That(className).IsEqualTo("Outer");
await Assert.That(methodName).IsEqualTo("Bar");
}
}
Loading