Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-22 21:21:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #98059 from zaevi/fix_csharp_unhandled_GD0303

Browse Source 
[.NET] Fix unhandled GD0303 error for nested generic attribute types
This commit is contained in:
Thaddeus Crews 2024-10-14 14:09:51 -05:00
commit c409546cc3
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/MustBeVariant.GD0301.cs
View File

@ -395,6 +395,11 @@ public class MustBeVariantAnnotatedMethods
public void MethodWithWrongAttribute() public void MethodWithWrongAttribute()
{ {
} }
[NestedGenericTypeAttributeContainer.NestedGenericTypeAttribute<bool>()]
public void MethodWithNestedAttribute()
{
}
} }
[GenericTypeAttribute<bool>()] [GenericTypeAttribute<bool>()]
@ -657,3 +662,11 @@ public class ClassNonVariantAnnotated
public class GenericTypeAttribute<[MustBeVariant] T> : Attribute public class GenericTypeAttribute<[MustBeVariant] T> : Attribute
{ {
} }
public class NestedGenericTypeAttributeContainer
{
[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
public class NestedGenericTypeAttribute<[MustBeVariant] T> : Attribute
{
}
}

2
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MustBeVariantAnalyzer.cs
View File

@ -135,7 +135,7 @@ namespace Godot.SourceGenerators
{ {
ITypeParameterSymbol? typeParamSymbol = parentSymbol switch ITypeParameterSymbol? typeParamSymbol = parentSymbol switch
{ {
IMethodSymbol methodSymbol when parentSyntax.Parent is AttributeSyntax && IMethodSymbol methodSymbol when parentSyntax.Ancestors().Any(s => s is AttributeSyntax) &&
methodSymbol.ContainingType.TypeParameters.Length > 0 methodSymbol.ContainingType.TypeParameters.Length > 0
=> methodSymbol.ContainingType.TypeParameters[typeArgumentIndex], => methodSymbol.ContainingType.TypeParameters[typeArgumentIndex],