Merge pull request #196 from nenoNaninu/fix_nullable_annotation

Fix nullable annotation
nenoNaninu · Apr 2, 2024 · f7c2cd8 · f7c2cd8
2 parents c05a885 + b91c102
commit f7c2cd8
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/src/TypedSignalR.Client/Templates/MethodMetadataExtensions.cs b/src/TypedSignalR.Client/Templates/MethodMetadataExtensions.cs
@@ -139,7 +139,7 @@ public static string CreateParameterTypeArrayString(this MethodMetadata methodMe
 
         if (methodMetadata.Parameters.Count == 1)
         {
-            return $"new[] {{ typeof({methodMetadata.Parameters[0].TypeName}) }}";
+            return $"new[] {{ typeof({methodMetadata.Parameters[0].Type.ToDisplayString(SymbolDisplayFormatRule.FullyQualifiedFormat)}) }}";
         }
 
         var sb = new StringBuilder();

diff --git a/tests/TypedSignalR.Client.Tests.NuGet/TypedSignalR.Client.Tests.NuGet.csproj b/tests/TypedSignalR.Client.Tests.NuGet/TypedSignalR.Client.Tests.NuGet.csproj
@@ -36,7 +36,7 @@
         <Compile Include="..\TypedSignalR.Client.Tests\Hubs\ReceiverTest.cs" LinkBase="Hubs" />
         <Compile Include="..\TypedSignalR.Client.Tests\Hubs\StreamingTest.cs" LinkBase="Hubs" />
         <Compile Include="..\TypedSignalR.Client.Tests\Hubs\UnaryTest.cs" LinkBase="Hubs" />
-        <Compile Include="..\TypedSignalR.Client.Tests\Hubs\NullableHubTest.cs" LinkBase="Hubs" />
+        <!--<Compile Include="..\TypedSignalR.Client.Tests\Hubs\NullableHubTest.cs" LinkBase="Hubs" />-->
     </ItemGroup>
 
 </Project>
diff --git a/tests/TypedSignalR.Client.Tests.Shared/INullableTestHub.cs b/tests/TypedSignalR.Client.Tests.Shared/INullableTestHub.cs
@@ -8,3 +8,13 @@ public interface INullableTestHub
     Task<string> GetReferenceType(string message);
     Task<string?> GetNullableReferenceType(string? message);
 }
+
+
+public interface INullableTestIReceiver
+{
+    Task<int> GetStruct(int message);
+    Task<int?> GetNullableStruct(int? message);
+
+    Task<string> GetReferenceType(string message);
+    Task<string?> GetNullableReferenceType(string? message);
+}
diff --git a/tests/TypedSignalR.Client.Tests/Hubs/NullableHubTest.cs b/tests/TypedSignalR.Client.Tests/Hubs/NullableHubTest.cs
@@ -122,4 +122,33 @@ public async Task GetNullableReferenceType2()
 
         await hubConnection.StopAsync(_cancellationTokenSource.Token);
     }
+
+    private void CompileTest()
+    {
+        var hubConnection = CreateHubConnection("/Hubs/NullableTestHub", HttpTransportType.WebSockets);
+        hubConnection.Register<INullableTestIReceiver>(new NullableTestIReceiver());
+    }
+
+    private class NullableTestIReceiver : INullableTestIReceiver
+    {
+        public Task<string?> GetNullableReferenceType(string? message)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<int?> GetNullableStruct(int? message)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<string> GetReferenceType(string message)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<int> GetStruct(int message)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }