Generator: better support arrays. Avoid namespaces conflicts.

Dreamescaper · Jan 3, 2025 · c255880 · c255880
1 parent 52e5ee9
commit c255880
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/BlazorBindings.Maui.ComponentGenerator/Extensions/SymbolExtensions.cs b/src/BlazorBindings.Maui.ComponentGenerator/Extensions/SymbolExtensions.cs
@@ -65,7 +65,7 @@ public static string GetFullName(this INamespaceOrTypeSymbol namespaceOrType)
         }
 
         var currentNamespace = namespaceOrType.ContainingNamespace;
-        while (!currentNamespace.IsGlobalNamespace)
+        while (currentNamespace != null && !currentNamespace.IsGlobalNamespace)
         {
             stack.Push(currentNamespace.Name);
             currentNamespace = currentNamespace.ContainingNamespace;
@@ -86,7 +86,9 @@ private static string GetName(INamespaceOrTypeSymbol namespaceOrType)
         }
         else
         {
-            return namespaceOrType.Name;
+            return namespaceOrType.CanBeReferencedByName
+                ? namespaceOrType.Name
+                : namespaceOrType.ToString();
         }
     }
 

diff --git a/src/BlazorBindings.Maui.ComponentGenerator/GeneratedTypeInfo.cs b/src/BlazorBindings.Maui.ComponentGenerator/GeneratedTypeInfo.cs
@@ -15,15 +15,7 @@ public record GeneratedTypeInfo(
 {
     public string GetTypeNameAndAddNamespace(string @namespace, string typeName)
     {
-        // Adding random usings might cause conflicts with global usings.
-        // Therefore, we only add usings for commonly used namespaces.
-
         var @using = Usings.FirstOrDefault(u => u.Namespace == @namespace);
-        if (@using == null && (@namespace.StartsWith("System.") || @namespace.StartsWith("Microsoft.")))
-        {
-            @using = new UsingStatement { Namespace = @namespace, IsUsed = true };
-            Usings.Add(@using);
-        }
 
         if (@using != null)
         {
@@ -39,11 +31,24 @@ public string GetTypeNameAndAddNamespace(string @namespace, string typeName)
             return $"{aliasedNs}.{typeName}";
         }
 
+        // Adding random usings might cause conflicts with global usings.
+        // Therefore, we only add usings for commonly used namespaces.
+        if (@using == null && (@namespace.StartsWith("System.") || @namespace.StartsWith("Microsoft.")))
+        {
+            @using = new UsingStatement { Namespace = @namespace, IsUsed = true };
+            Usings.Add(@using);
+        }
+
         return $"global::{@namespace}.{typeName}";
     }
 
     public string GetTypeNameAndAddNamespace(ITypeSymbol type)
     {
+        if (type is IArrayTypeSymbol arrayType)
+        {
+            return $"{GetTypeNameAndAddNamespace(arrayType.ElementType)}[]";
+        }
+
         var typeName = type.GetCSharpTypeName();
         if (typeName != null)
         {