Fix #46 Call static field with generic type

zompinc · Jan 21, 2024 · 23e00d5 · 23e00d5
1 parent e596a52
commit 23e00d5
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs b/src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs
@@ -47,6 +47,14 @@ internal sealed class AsyncToSyncRewriter(SemanticModel semanticModel) : CSharpS
             SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
             SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
 
+    private static readonly SymbolDisplayFormat GlobalDisplayFormatWithTypeParameters = new(
+        globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Included,
+        typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+        genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+        miscellaneousOptions:
+            SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+            SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+
     private static readonly SymbolDisplayFormat NamespaceDisplayFormat = new(
         typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
         genericsOptions: SymbolDisplayGenericsOptions.None,
@@ -254,7 +262,7 @@ static BinaryExpressionSyntax CheckNull(ExpressionSyntax expr) => BinaryExpressi
         else if (node.Parent is not MemberAccessExpressionSyntax
             && GetSymbol(node) is IFieldSymbol { IsStatic: true } fieldSymbol)
         {
-            var typeString = fieldSymbol.ContainingType.ToDisplayString(GlobalDisplayFormat);
+            var typeString = fieldSymbol.ContainingType.ToDisplayString(GlobalDisplayFormatWithTypeParameters);
             return @base.WithIdentifier(Identifier($"{typeString}.{fieldSymbol.Name}"));
         }
 

diff --git a/tests/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj b/tests/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <NoWarn>$(NoWarn);CS0219;CA1812;CA1852;SA1402;CA1822;SA1201;CA1303;SA1124;IDE0035;CS0162;RS1035;CS8619;CS8603;CA5394</NoWarn>
+    <NoWarn>$(NoWarn);CS0219;CA1812;CA1852;SA1402;CA1822;SA1201;CA1303;SA1124;IDE0035;CS0162;RS1035;CS8619;CS8603;CS1998;CA5394</NoWarn>
     <ImplicitUsings>false</ImplicitUsings>
     <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>

diff --git a/.../Snapshots/UnitTests.GenericClassMemberAccess#Test.GenericClass.MethodAsync.g.verified.cs b/.../Snapshots/UnitTests.GenericClassMemberAccess#Test.GenericClass.MethodAsync.g.verified.cs
@@ -0,0 +1,11 @@
+//HintName: Test.GenericClass.MethodAsync.g.cs
+// <auto-generated/>
+#nullable enable
+namespace Test;
+partial class GenericClass<T>
+{
+    public void Method()
+    {
+        _ = global::Test.GenericClass<T>.Bar;
+    }
+}
diff --git a/tests/Generator.Tests/UnitTests.cs b/tests/Generator.Tests/UnitTests.cs
@@ -58,6 +58,22 @@ async void EmptyAsync()
     {
     }
 }
+""".Verify(sourceType: SourceType.Full);
+
+    [Fact]
+    public Task GenericClassMemberAccess() => """
+namespace Test;
+partial class GenericClass<T>
+{
+    private const string Bar = "Bar";
+
+    [CreateSyncVersion]
+    public async Task MethodAsync()
+    {
+        _ = Bar;
+    }
+}
+
 """.Verify(sourceType: SourceType.Full);
 
     [Fact]