Merge pull request #106744 from L2750558108/fix-@-error-in-c#

Repiteo · Repiteo · commit 37a48c89f907 · 2025-08-24T11:04:31.000-05:00
Fix source generator exceptions appearing when use "@+internal keyword" as type or namespace name in C# script
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/KeywordClassNameAndNamespaceTest.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/KeywordClassNameAndNamespaceTest.cs
@@ -0,0 +1,15 @@
+using Xunit;
+
+namespace Godot.SourceGenerators.Tests;
+
+public class KeywordClassAndNamespaceTest
+{
+    [Fact]
+    public async void GenerateScriptMethodsTest()
+    {
+        await CSharpSourceGeneratorVerifier<ScriptMethodsGenerator>.Verify(
+            "KeywordClassNameAndNamespace.cs",
+            "namespace.class_ScriptMethods.generated.cs"
+        );
+    }
+}
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/namespace.class_ScriptMethods.generated.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/namespace.class_ScriptMethods.generated.cs
@@ -0,0 +1,17 @@
+using Godot;
+using Godot.NativeInterop;
+
+namespace @namespace {
+
+partial class @class
+{
+#pragma warning disable CS0109 // Disable warning about redundant 'new' keyword
+    /// <summary>
+    /// Cached StringNames for the methods contained in this class, for fast lookup.
+    /// </summary>
+    public new class MethodName : global::Godot.GodotObject.MethodName {
+    }
+#pragma warning restore CS0109
+}
+
+}
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/KeywordClassNameAndNamespace.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/KeywordClassNameAndNamespace.cs
@@ -0,0 +1,8 @@
+using Godot;
+
+namespace @namespace
+{
+    partial class @class : GodotObject
+    {
+    }
+}
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
@@ -181,13 +181,6 @@ public static string GetAccessibilityKeyword(this INamedTypeSymbol namedTypeSymb
             };
         }
 
-        public static string NameWithTypeParameters(this INamedTypeSymbol symbol)
-        {
-            return symbol.IsGenericType && symbol.TypeParameters.Length > 0 ?
-                string.Concat(symbol.Name, "<", string.Join(", ", symbol.TypeParameters), ">") :
-                symbol.Name;
-        }
-
         private static SymbolDisplayFormat FullyQualifiedFormatOmitGlobal { get; } =
             SymbolDisplayFormat.FullyQualifiedFormat
                 .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted);
@@ -268,6 +261,8 @@ static void ParenEnclosedFullQualifiedSyntax(SyntaxNode node, SemanticModel sm,
 
         public static string SanitizeQualifiedNameForUniqueHint(this string qualifiedName)
             => qualifiedName
+                // AddSource() doesn't support @ prefix
+                .Replace("@", "")
                 // AddSource() doesn't support angle brackets
                 .Replace("<", "(Of ")
                 .Replace(">", ")");
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptMethodsGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptMethodsGenerator.cs
@@ -114,13 +114,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)
                     source.Append("partial ");
                     source.Append(containingType.GetDeclarationKeyword());
                     source.Append(" ");
-                    source.Append(containingType.NameWithTypeParameters());
+                    source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
                     source.Append("\n{\n");
                 }
             }
 
             source.Append("partial class ");
-            source.Append(symbol.NameWithTypeParameters());
+            source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
             source.Append("\n{\n");
 
             var members = symbol.GetMembers();
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs
@@ -138,7 +138,7 @@ IEnumerable<ClassDeclarationSyntax> classDeclarations
 
             source.Append(attributes);
             source.Append("\npartial class ");
-            source.Append(symbol.NameWithTypeParameters());
+            source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
             source.Append("\n{\n}\n");
 
             if (hasNamespace)
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertiesGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertiesGenerator.cs
@@ -103,13 +103,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)
                     source.Append("partial ");
                     source.Append(containingType.GetDeclarationKeyword());
                     source.Append(" ");
-                    source.Append(containingType.NameWithTypeParameters());
+                    source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
                     source.Append("\n{\n");
                 }
             }
 
             source.Append("partial class ");
-            source.Append(symbol.NameWithTypeParameters());
+            source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
             source.Append("\n{\n");
 
             var members = symbol.GetMembers();
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs
@@ -100,13 +100,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)
                     source.Append("partial ");
                     source.Append(containingType.GetDeclarationKeyword());
                     source.Append(" ");
-                    source.Append(containingType.NameWithTypeParameters());
+                    source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
                     source.Append("\n{\n");
                 }
             }
 
             source.Append("partial class ");
-            source.Append(symbol.NameWithTypeParameters());
+            source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
             source.Append("\n{\n");
 
             var exportedMembers = new List<ExportedPropertyMetadata>();
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSerializationGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSerializationGenerator.cs
@@ -101,13 +101,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)
                     source.Append("partial ");
                     source.Append(containingType.GetDeclarationKeyword());
                     source.Append(" ");
-                    source.Append(containingType.NameWithTypeParameters());
+                    source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
                     source.Append("\n{\n");
                 }
             }
 
             source.Append("partial class ");
-            source.Append(symbol.NameWithTypeParameters());
+            source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
             source.Append("\n{\n");
 
             var members = symbol.GetMembers();
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs
@@ -103,13 +103,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)
                     source.Append("partial ");
                     source.Append(containingType.GetDeclarationKeyword());
                     source.Append(" ");
-                    source.Append(containingType.NameWithTypeParameters());
+                    source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
                     source.Append("\n{\n");
                 }
             }
 
             source.Append("partial class ");
-            source.Append(symbol.NameWithTypeParameters());
+            source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
             source.Append("\n{\n");
 
             var members = symbol.GetMembers();
diff --git a/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/ExtensionMethods.cs b/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/ExtensionMethods.cs
@@ -94,13 +94,6 @@ public static string GetDeclarationKeyword(this INamedTypeSymbol namedTypeSymbol
         };
     }
 
-    public static string NameWithTypeParameters(this INamedTypeSymbol symbol)
-    {
-        return symbol.IsGenericType && symbol.TypeParameters.Length > 0 ?
-            string.Concat(symbol.Name, "<", string.Join(", ", symbol.TypeParameters), ">") :
-            symbol.Name;
-    }
-
     private static SymbolDisplayFormat FullyQualifiedFormatOmitGlobal { get; } =
         SymbolDisplayFormat.FullyQualifiedFormat
             .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted);
@@ -123,6 +116,8 @@ public static string FullQualifiedNameIncludeGlobal(this INamespaceSymbol namesp
 
     public static string SanitizeQualifiedNameForUniqueHint(this string qualifiedName)
         => qualifiedName
+            // AddSource() doesn't support @ prefix
+            .Replace("@", "")
             // AddSource() doesn't support angle brackets
             .Replace("<", "(Of ")
             .Replace(">", ")");
diff --git a/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/UnmanagedCallbacksGenerator.cs b/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/UnmanagedCallbacksGenerator.cs
@@ -140,7 +140,7 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)
                 source.Append("partial ");
                 source.Append(containingType.GetDeclarationKeyword());
                 source.Append(" ");
-                source.Append(containingType.NameWithTypeParameters());
+                source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
                 source.Append("\n{\n");
             }
         }
@@ -319,7 +319,7 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)
                 source.Append("partial ");
                 source.Append(containingType.GetDeclarationKeyword());
                 source.Append(" ");
-                source.Append(containingType.NameWithTypeParameters());
+                source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
                 source.Append("\n{\n");
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -114,13 +114,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)`
`114`	`114`	`source.Append("partial ");`
`115`	`115`	`source.Append(containingType.GetDeclarationKeyword());`
`116`	`116`	`source.Append(" ");`
`117`		`- source.Append(containingType.NameWithTypeParameters());`
	`117`	`+ source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));`
`118`	`118`	`source.Append("\n{\n");`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`source.Append("partial class ");`
`123`		`- source.Append(symbol.NameWithTypeParameters());`
	`123`	`+ source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));`
`124`	`124`	`source.Append("\n{\n");`
`125`	`125`
`126`	`126`	`var members = symbol.GetMembers();`
Original file line number	Diff line number	Diff line change
`@@ -103,13 +103,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)`
`103`	`103`	`source.Append("partial ");`
`104`	`104`	`source.Append(containingType.GetDeclarationKeyword());`
`105`	`105`	`source.Append(" ");`
`106`		`- source.Append(containingType.NameWithTypeParameters());`
	`106`	`+ source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));`
`107`	`107`	`source.Append("\n{\n");`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`source.Append("partial class ");`
`112`		`- source.Append(symbol.NameWithTypeParameters());`
	`112`	`+ source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));`
`113`	`113`	`source.Append("\n{\n");`
`114`	`114`
`115`	`115`	`var members = symbol.GetMembers();`
Original file line number	Diff line number	Diff line change
`@@ -100,13 +100,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)`
`100`	`100`	`source.Append("partial ");`
`101`	`101`	`source.Append(containingType.GetDeclarationKeyword());`
`102`	`102`	`source.Append(" ");`
`103`		`- source.Append(containingType.NameWithTypeParameters());`
	`103`	`+ source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));`
`104`	`104`	`source.Append("\n{\n");`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`source.Append("partial class ");`
`109`		`- source.Append(symbol.NameWithTypeParameters());`
	`109`	`+ source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));`
`110`	`110`	`source.Append("\n{\n");`
`111`	`111`
`112`	`112`	`var exportedMembers = new List<ExportedPropertyMetadata>();`
Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,13 @@ void AppendPartialContainingTypeDeclarations(INamedTypeSymbol? containingType)`
`101`	`101`	`source.Append("partial ");`
`102`	`102`	`source.Append(containingType.GetDeclarationKeyword());`
`103`	`103`	`source.Append(" ");`
`104`		`- source.Append(containingType.NameWithTypeParameters());`
	`104`	`+ source.Append(containingType.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));`
`105`	`105`	`source.Append("\n{\n");`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`source.Append("partial class ");`
`110`		`- source.Append(symbol.NameWithTypeParameters());`
	`110`	`+ source.Append(symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));`
`111`	`111`	`source.Append("\n{\n");`
`112`	`112`
`113`	`113`	`var members = symbol.GetMembers();`