Merge pull request #46953 from neikeq/issue-46879

C#: Fix ScriptPathAttribute generator with none or nested namespaces

2 files changed, 47 insertions, 18 deletions

diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
index c3e74822d5..e16f72f43a 100644
--- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
@@ -82,5 +82,8 @@ namespace Godot.SourceGenerators
 
         public static string FullQualifiedName(this INamedTypeSymbol symbol)
             => symbol.ToDisplayString(NullableFlowState.NotNull, FullyQualifiedFormatOmitGlobal);
+
+        public static string FullQualifiedName(this INamespaceSymbol namespaceSymbol)
+            => namespaceSymbol.ToDisplayString(FullyQualifiedFormatOmitGlobal);
     }
 }
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs
index 150e59e414..a51728e221 100644
--- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs
@@ -69,7 +69,7 @@ namespace Godot.SourceGenerators
             IEnumerable<ClassDeclarationSyntax> classDeclarations
         )
         {
-            var attributesBuilder = new StringBuilder();
+            var attributes = new StringBuilder();
 
             // Remember syntax trees for which we already added an attribute, to prevent unnecessary duplicates.
             var attributedTrees = new List<SyntaxTree>();
@@ -81,28 +81,54 @@ namespace Godot.SourceGenerators
 
                 attributedTrees.Add(cds.SyntaxTree);
 
-                if (attributesBuilder.Length != 0)
-                    attributesBuilder.Append("\n    ");
+                if (attributes.Length != 0)
+                    attributes.Append("\n");
 
-                attributesBuilder.Append(@"[ScriptPathAttribute(""res://");
-                attributesBuilder.Append(RelativeToDir(cds.SyntaxTree.FilePath, godotProjectDir));
-                attributesBuilder.Append(@""")]");
+                attributes.Append(@"[ScriptPathAttribute(""res://");
+                attributes.Append(RelativeToDir(cds.SyntaxTree.FilePath, godotProjectDir));
+                attributes.Append(@""")]");
             }
 
-            string classNs = symbol.ContainingNamespace.Name;
             string className = symbol.Name;
 
-            var source = $@"using Godot;
-namespace {classNs}
-{{
-    {attributesBuilder}
-    partial class {className}
-    {{
-    }}
-}}
-";
-            context.AddSource(classNs + "." + className + "_ScriptPath_Generated",
-                SourceText.From(source, Encoding.UTF8));
+            INamespaceSymbol namespaceSymbol = symbol.ContainingNamespace;
+            string classNs = namespaceSymbol != null && !namespaceSymbol.IsGlobalNamespace ?
+                namespaceSymbol.FullQualifiedName() :
+                string.Empty;
+            bool hasNamespace = classNs.Length != 0;
+
+            string uniqueName = hasNamespace ?
+                classNs + "." + className + "_ScriptPath_Generated" :
+                className + "_ScriptPath_Generated";
+
+            var source = new StringBuilder();
+
+            // using Godot;
+            // namespace {classNs} {
+            //     {attributesBuilder}
+            //     partial class {className} { }
+            // }
+
+            source.Append("using Godot;\n");
+
+            if (hasNamespace)
+            {
+                source.Append("namespace ");
+                source.Append(classNs);
+                source.Append(" {\n\n");
+            }
+
+            source.Append(attributes);
+            source.Append("\n    partial class ");
+            source.Append(className);
+            source.Append("\n{\n}\n");
+
+            if (hasNamespace)
+            {
+                source.Append("\n}\n");
+            }
+
+            context.AddSource(uniqueName, SourceText.From(source.ToString(), Encoding.UTF8));
         }
 
         private static void AddScriptTypesAssemblyAttr(GeneratorExecutionContext context,