Skip to content
Open
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 @@ -134,13 +134,7 @@ private static bool IsExtensionClassSignatureValid(ClassDeclarationSyntax syntax
return true;
}

internal static bool IsSyntaxTargetForGeneration(SyntaxNode node) => node is MemberAccessExpressionSyntax
{
Name: GenericNameSyntax
{
Arity: 1
}
};
internal static bool IsSyntaxTargetForGeneration(SyntaxNode node) => node is MemberAccessExpressionSyntax{ Name: SimpleNameSyntax };

internal static MemberAccessExpressionSyntax? GetSemanticTargetForGeneration(GeneratorSyntaxContext context)
{
Expand Down Expand Up @@ -251,10 +245,10 @@ internal SourceGenerationSpec Parse(ImmutableArray<MethodDeclarationSyntax> meth
var argModel = _compilation.GetSemanticModel(argType.SyntaxTree);
symbol = (ITypeSymbol)argModel.GetSymbolInfo(argType).Symbol;
}
else if (memberAccess.Name is not GenericNameSyntax
&& memberAccess.Parent.ChildNodes().FirstOrDefault(x => x is ArgumentListSyntax) is
ArgumentListSyntax
{ Arguments: { Count: 1 } } als)
else if (memberAccess.Name is SimpleNameSyntax
&& memberAccess.Parent.ChildNodes().FirstOrDefault(x => x is ArgumentListSyntax) is
ArgumentListSyntax
{ Arguments: { Count: 1 } } als)
{
// Method isn't using generic syntax so inspect first expression in arguments to deduce the type
var argModel = _compilation.GetSemanticModel(als.Arguments[0].Expression.SyntaxTree);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public interface IMyClient
Task ReturnTask();
}

private class MyClient : IMyClient
internal class MyClient : IMyClient
{
public int CallsOfNoArg;
public void NoArg()
Expand Down Expand Up @@ -259,4 +259,52 @@ public async Task CallbacksGetTriggered()
await returnTaskFunc(Array.Empty<object>(), returnTaskState);
Assert.Equal(1, myClient.CallsOfReturnTask);
}

[Fact]
public void RegistersCallbackProviderWithExplicitGeneric()
{
// Arrange
var mockConn = MockHubConnection.Get();
var noArgReg = new Disposable();
mockConn
.Setup(x => x.On(
"NoArg",
Array.Empty<Type>(),
It.IsAny<Func<object[], object, Task>>(),
It.IsAny<object>()))
.Returns(noArgReg);
var conn = mockConn.Object;
var myClient = new MyClient();

// Act
var registration = conn.SetHubClient<IMyClient>(myClient);

// Assert
mockConn.VerifyAll();
Assert.False(noArgReg.IsDisposed);
}

[Fact]
public void RegistersCallbackProviderWithInferredGeneric()
{
// Arrange
var mockConn = MockHubConnection.Get();
var noArgReg = new Disposable();
mockConn
.Setup(x => x.On(
"NoArg",
Array.Empty<Type>(),
It.IsAny<Func<object[], object, Task>>(),
It.IsAny<object>()))
.Returns(noArgReg);
var conn = mockConn.Object;
var myClient = new MyClient();

// Act
var registration = conn.SetHubClient(myClient); // Inferred generic type

// Assert
mockConn.VerifyAll();
Assert.False(noArgReg.IsDisposed);
}
}