From b87004bb8c6efc6fd42d55b125764c5434761275 Mon Sep 17 00:00:00 2001 From: mischa Date: Fri, 23 Jun 2023 11:17:26 +0800 Subject: [PATCH] fix --- Assets/Mirror/Editor/Weaver/Weaver.cs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Assets/Mirror/Editor/Weaver/Weaver.cs b/Assets/Mirror/Editor/Weaver/Weaver.cs index 7e61e7510..c90014340 100644 --- a/Assets/Mirror/Editor/Weaver/Weaver.cs +++ b/Assets/Mirror/Editor/Weaver/Weaver.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using Mono.CecilX; using Mono.CecilX.Cil; +using Mono.CecilX.Rocks; namespace Mirror.Weaver { @@ -119,23 +120,24 @@ bool WeaveModule(ModuleDefinition moduleDefinition) Stopwatch watch = Stopwatch.StartNew(); watch.Start(); - foreach (TypeDefinition td in moduleDefinition.Types) + // ModuleDefinition.Types only finds top level types. + // GetAllTypes recursively finds all nested types as well. + // fixes nested types not being weaved, for example: + // class Foo { // ModuleDefinition.Types finds this + // class Nested { // .Types.NestedTypes finds this + // class DeepNested { // only GetAllTypes finds this too + // } + // } + // } + foreach (TypeDefinition td in moduleDefinition.GetAllTypes()) { // weave base type: - Log.Warning($"WEAVER CONSIDERING: {td.FullName}"); + Log.Warning($"GETALL: {td.FullName}"); if (td.IsClass && td.BaseType.CanBeResolved()) { modified |= WeaveNetworkBehavior(td); modified |= ServerClientAttributeProcessor.Process(weaverTypes, Log, td, ref WeavingFailed); } - - // TODO weave nested types recursively - foreach (TypeDefinition nestedTd in td.NestedTypes) - { - Log.Warning($" NESTED: {nestedTd.FullName}"); - modified |= WeaveNetworkBehavior(nestedTd); - modified |= ServerClientAttributeProcessor.Process(weaverTypes, Log, nestedTd, ref WeavingFailed); - } } watch.Stop();