asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #70511 from raulsntos/dotnet/fix-update-script-class-info

Browse source 
C#: Skip getting class info for unbound generics
This commit is contained in:
Ignacio Roldán Etcheverry 2022-12-30 01:29:53 +01:00 committed by GitHub
commit 0daa86d70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPathAttributeGenerator.cs
View file

@ -45,8 +45,11 @@ namespace Godot.SourceGenerators
return false; return false;
}) })
) )
// Ignore classes whose name is not the same as the file name .Where(x =>
.Where(x => Path.GetFileNameWithoutExtension(x.cds.SyntaxTree.FilePath) == x.symbol.Name) // Ignore classes whose name is not the same as the file name
Path.GetFileNameWithoutExtension(x.cds.SyntaxTree.FilePath) == x.symbol.Name &&
// Ignore generic classes
!x.symbol.IsGenericType)
.GroupBy(x => x.symbol) .GroupBy(x => x.symbol)
.ToDictionary(g => g.Key, g => g.Select(x => x.cds)); .ToDictionary(g => g.Key, g => g.Select(x => x.cds));
@ -150,8 +153,6 @@ namespace Godot.SourceGenerators
first = false; first = false;
sourceBuilder.Append("typeof("); sourceBuilder.Append("typeof(");
sourceBuilder.Append(qualifiedName); sourceBuilder.Append(qualifiedName);
if (godotClass.Key.IsGenericType)
sourceBuilder.Append($"<{new string(',', godotClass.Key.TypeParameters.Count() - 1)}>");
sourceBuilder.Append(")"); sourceBuilder.Append(")");
} }

10
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
View file

@ -297,7 +297,7 @@ namespace Godot.Bridge
foreach (var type in assembly.GetTypes()) foreach (var type in assembly.GetTypes())
{ {
if (type.IsNested) if (type.IsNested || type.IsGenericType)
continue; continue;
if (!typeOfGodotObject.IsAssignableFrom(type)) if (!typeOfGodotObject.IsAssignableFrom(type))
@ -314,9 +314,12 @@ namespace Godot.Bridge
if (scriptTypes != null) if (scriptTypes != null)
{ {
for (int i = 0; i < scriptTypes.Length; i++) foreach (var type in scriptTypes)
{ {
LookupScriptForClass(scriptTypes[i]); if (type.IsGenericType)
continue;
LookupScriptForClass(type);
} }
} }
} }
@ -729,6 +732,7 @@ namespace Godot.Bridge
{ {
ExceptionUtils.LogException(e); ExceptionUtils.LogException(e);
*outTool = godot_bool.False; *outTool = godot_bool.False;
*outMethodsDest = NativeFuncs.godotsharp_array_new();
*outRpcFunctionsDest = NativeFuncs.godotsharp_dictionary_new(); *outRpcFunctionsDest = NativeFuncs.godotsharp_dictionary_new();
*outEventSignalsDest = NativeFuncs.godotsharp_dictionary_new(); *outEventSignalsDest = NativeFuncs.godotsharp_dictionary_new();
*outBaseScript = default; *outBaseScript = default;