Fix Godot.SourceGenerators for generic classes

Fix invalid C# generated by source generators for generic classes and
add generic classes to the Sample project for testing.

2 files changed, 30 insertions, 5 deletions

diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Generic.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Generic.cs
new file mode 100644
index 0000000000..2ddb8880c2
--- /dev/null
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Generic.cs
@@ -0,0 +1,16 @@
+namespace Godot.SourceGenerators.Sample
+{
+    partial class Generic<T> : Godot.Object
+    {
+    }
+
+    // Generic again but different generic parameters
+    partial class Generic<T, R> : Godot.Object
+    {
+    }
+
+    // Generic again but without generic parameters
+    partial class Generic : Godot.Object
+    {
+    }
+}
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 a51728e221..fa65595290 100644
--- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs
@@ -97,9 +97,13 @@ namespace Godot.SourceGenerators
                 string.Empty;
             bool hasNamespace = classNs.Length != 0;
 
-            string uniqueName = hasNamespace ?
-                classNs + "." + className + "_ScriptPath_Generated" :
-                className + "_ScriptPath_Generated";
+            var uniqueName = new StringBuilder();
+            if (hasNamespace)
+                uniqueName.Append($"{classNs}.");
+            uniqueName.Append(className);
+            if (symbol.IsGenericType)
+                uniqueName.Append($"Of{string.Join(string.Empty, symbol.TypeParameters)}");
+            uniqueName.Append("_ScriptPath_Generated");
 
             var source = new StringBuilder();
 
@@ -121,6 +125,8 @@ namespace Godot.SourceGenerators
             source.Append(attributes);
             source.Append("\n    partial class ");
             source.Append(className);
+            if (symbol.IsGenericType)
+                source.Append($"<{string.Join(", ", symbol.TypeParameters)}>");
             source.Append("\n{\n}\n");
 
             if (hasNamespace)
@@ -128,7 +134,7 @@ namespace Godot.SourceGenerators
                 source.Append("\n}\n");
             }
 
-            context.AddSource(uniqueName, SourceText.From(source.ToString(), Encoding.UTF8));
+            context.AddSource(uniqueName.ToString(), SourceText.From(source.ToString(), Encoding.UTF8));
         }
 
         private static void AddScriptTypesAssemblyAttr(GeneratorExecutionContext context,
@@ -145,12 +151,15 @@ namespace Godot.SourceGenerators
             foreach (var godotClass in godotClasses)
             {
                 var qualifiedName = godotClass.Key.ToDisplayString(
-                    NullableFlowState.NotNull, SymbolDisplayFormat.FullyQualifiedFormat);
+                    NullableFlowState.NotNull, SymbolDisplayFormat.FullyQualifiedFormat
+                        .WithGenericsOptions(SymbolDisplayGenericsOptions.None));
                 if (!first)
                     sourceBuilder.Append(", ");
                 first = false;
                 sourceBuilder.Append("typeof(");
                 sourceBuilder.Append(qualifiedName);
+                if (godotClass.Key.IsGenericType)
+                    sourceBuilder.Append($"<{new string(',', godotClass.Key.TypeParameters.Count() - 1)}>");
                 sourceBuilder.Append(")");
             }