[#142] Adding namespaces to types

Author: Cat-Lips

Godot 4 Tests/TestScenes/Feature148.ResourceTree/SpriteFrames/new_sprite_frames.tres

@@ -0,0 +1,3 @@
+[gd_resource type="SpriteFrames" format=3 uid="uid://cj88kr1oscubs"]
+
+[resource]

SourceGenerators/ResourceTreeExtensions/ResourceTreeScraper.cs

@@ -76,6 +76,7 @@ void AddFile(string file, string name, string type)
                     GetResource(out var res);
                     name = name.ToPascalCase();
                     type = cfg.UseGdLoad ? type : null;
+                    if (type is not null) type = compilation.GetFullName(type);
                     var node = new ResourceTreeFile(name, res, type, show);
                     Log.Debug($" - {node}");
                     parent.Add(node);
@@ -94,6 +95,7 @@ void GetResource(out string res)
                 void AddExports(string[] exports, string type)
                 {
                     type = cfg.UseGdLoad ? type : null;
+                    if (type is not null) type = compilation.GetFullName(type);
 
                     foreach (var res in exports)
                     {

SourceGenerators/Utilities/Extensions/CompilationExtensions.cs

@@ -4,59 +4,100 @@ namespace GodotSharp.SourceGenerators;
 
 public static class CompilationExtensions
 {
-    public static string GetFullName(this Compilation compilation, string type, string hint = "")
+    // TODO:  Cache?
+    public static string GetValidType(this Compilation compilation, string type)
     {
-        return ResolveDuplicates(compilation.GetSymbolsWithName(type, SymbolFilter.Type))?.GlobalName();
+        return SearchCurrentCompilation()
+            ?? SearchReferencedAssemblies();
 
-        ISymbol ResolveDuplicates(IEnumerable<ISymbol> symbols)
+        string SearchCurrentCompilation()
+            => compilation.ContainsSymbolsWithName(type, SymbolFilter.Type) ? type : null;
+
+        string SearchReferencedAssemblies()
         {
-            if (symbols.Skip(1).Any())
-            {
-                symbols = symbols // Ignore generics
-                    .Where(x => x.MetadataName == type);
+            var refs = compilation.GetUsedAssemblyReferences()
+                .Select(compilation.GetAssemblyOrModuleSymbol)
+                .Cast<IAssemblySymbol>()
+                .OrderByDescending(asm => asm.Name is "GodotSharp");
 
-                if (symbols.Skip(1).Any())
+            foreach (var asm in refs)
+            {
+                if (asm.Name is "GodotSharp")
                 {
-                    // Differentiate by path
-                    symbols = symbols.Where(x => x.Locations.Select(x => x.GetLineSpan().Path.Replace("\\", "/")).Any(x => x.EndsWith(hint)));
-
-                    if (symbols.Skip(1).Any())
-                        Log.Warn($"Choosing first from multiple candidates [Type: {type}, Namespaces: {string.Join("|", symbols.Select(x => x.Namespace()))}]");
+                    // Some names in Godot have mismatched case (mostly 2d/2D & 3d,3D)
+                    var csType = asm.TypeNames.FirstOrDefault(x => x.Equals(type, StringComparison.OrdinalIgnoreCase));
+                    if (csType is not null) return csType;
                 }
+
+                Log.Debug($"*** Searching for {type} in {asm.Name}");
+
+                if (asm.TypeNames.Contains(type))
+                    return type;
             }
 
-            return symbols.FirstOrDefault();
+            return null;
         }
     }
 
-    public static string GetValidType(this Compilation compilation, string type)
+    // TODO:  Cache?
+    public static string GetFullName(this Compilation compilation, string type)
     {
         return SearchCurrentCompilation()
             ?? SearchReferencedAssemblies();
 
-        string SearchCurrentCompilation()
-            => compilation.ContainsSymbolsWithName(type, SymbolFilter.Type) ? type : null;
+        string SearchCurrentCompilation() => compilation
+            .GetSymbolsWithName(type, SymbolFilter.Type)
+            .FirstOrDefault()?.FullName(); // TODO:  Resolve duplicates with hint if required (eg, ns/filepath)
 
         string SearchReferencedAssemblies()
         {
             var refs = compilation.GetUsedAssemblyReferences()
                 .Select(compilation.GetAssemblyOrModuleSymbol)
-                .Cast<IAssemblySymbol>();
+                .Cast<IAssemblySymbol>()
+                .OrderByDescending(asm => asm.Name is "GodotSharp");
 
             foreach (var asm in refs)
             {
-                if (asm.Name.StartsWith("GodotSharp"))
+                if (asm.Name is "GodotSharp")
                 {
                     // Some names in Godot have mismatched case (mostly 2d/2D & 3d,3D)
                     var csType = asm.TypeNames.FirstOrDefault(x => x.Equals(type, StringComparison.OrdinalIgnoreCase));
-                    if (csType is not null) return csType;
+                    if (csType is not null) return $"Godot.{csType}";
                 }
 
+                Log.Debug($"*** Searching for {type} in {asm.Name}");
+
                 if (asm.TypeNames.Contains(type))
-                    return type;
+                    return type; // TODO:  Walk namspace/type symbols if required
             }
 
             return null;
         }
     }
+
+    // Old
+    public static string GetFullName(this Compilation compilation, string type, string hint)
+    {
+        return ResolveDuplicates(compilation.GetSymbolsWithName(type, SymbolFilter.Type))?.GlobalName();
+
+        ISymbol ResolveDuplicates(IEnumerable<ISymbol> symbols)
+        {
+            if (symbols.Skip(1).Any())
+            {
+                symbols = symbols // Ignore generics
+                    .Where(x => x.MetadataName == type);
+
+                if (symbols.Skip(1).Any())
+                {
+                    // Differentiate by path
+                    symbols = symbols.Where(x => x.Locations.Select(x => x.GetLineSpan().Path.Replace("\\", "/")).Any(x => x.EndsWith(hint)));
+
+                    if (symbols.Skip(1).Any())
+                        Log.Warn($"Choosing first from multiple candidates [Type: {type}, Namespaces: {string.Join("|", symbols.Select(x => x.Namespace()))}]");
+                }
+            }
+
+            return symbols.FirstOrDefault();
+        }
+    }
 }

SourceGenerators/Utilities/Extensions/SymbolExtensions.cs

@@ -6,6 +6,9 @@ namespace GodotSharp.SourceGenerators;
 
 public static class SymbolExtensions
 {
+    private static readonly SymbolDisplayFormat FullNameFormat = SymbolDisplayFormat.FullyQualifiedFormat
+            .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted);
+
     public static string Namespace(this ISymbol symbol)
         => symbol.ContainingNamespace.FullName();
 
@@ -16,7 +19,7 @@ public static string NamespaceOrNull(this ISymbol symbol)
         => symbol.HasNamespace() ? symbol.Namespace() : null;
 
     public static string FullName(this ISymbol symbol)
-        => symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat).TrimPrefix("global::");
+        => symbol.ToDisplayString(FullNameFormat);
 
     public static string GlobalName(this ISymbol symbol)
         => symbol.HasNamespace() ? symbol.FullName() : symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);