Fixed using statement generation for nullable types #4454

MarimerLLC · Jan 23, 2025 · a529a48 · a529a48
1 parent 6d4798a
commit a529a48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/...tor.AutoImplementProperties.CSharp/AutoImplement/Discovery/DefinitionExtractionContext.cs b/...tor.AutoImplementProperties.CSharp/AutoImplement/Discovery/DefinitionExtractionContext.cs
@@ -48,12 +48,18 @@ public string GetTypeNamespace(TypeDeclarationSyntax typeDeclarationSyntax)
     public string GetTypeNamespace(TypeSyntax typeSyntax)
     {
       INamedTypeSymbol typeSymbol;
+      if (typeSyntax is NullableTypeSyntax nullableTypeSyntax)
+      {
+        typeSyntax = nullableTypeSyntax.ElementType;
+      }
+
       if (typeSyntax is ArrayTypeSyntax arrayTypeSyntax)
       {
         typeSymbol = _semanticModel.GetSymbolInfo(arrayTypeSyntax.ElementType).Symbol as INamedTypeSymbol;
       }
       else
       {
+
         typeSymbol = _semanticModel.GetSymbolInfo(typeSyntax).Symbol as INamedTypeSymbol;
       }
       if (typeSymbol is null || typeSymbol.ContainingNamespace is null) return string.Empty;

diff --git a/...erator.AutoSerialization.CSharp/AutoSerializable/Discovery/DefinitionExtractionContext.cs b/...erator.AutoSerialization.CSharp/AutoSerializable/Discovery/DefinitionExtractionContext.cs
@@ -54,6 +54,11 @@ public string GetTypeNamespace(TypeDeclarationSyntax typeDeclarationSyntax)
     public string GetTypeNamespace(TypeSyntax typeSyntax)
     {
       INamedTypeSymbol typeSymbol;
+
+      if (typeSyntax is NullableTypeSyntax nullableTypeSyntax)
+      {
+        typeSyntax = nullableTypeSyntax.ElementType;
+      }
 
       typeSymbol = _semanticModel.GetSymbolInfo(typeSyntax).Symbol as INamedTypeSymbol;
       if (typeSymbol is null || typeSymbol.ContainingNamespace is null) return string.Empty;