com.wallstop-studios.dxmessaging 2.0.0-rc11 → 2.0.0-rc12

package/SourceGenerators/WallstopStudios.DxMessaging.SourceGenerators/DxTargetedMessageGenerator.cs

@@ -23,36 +23,49 @@ public sealed class DxTargetedMessageGenerator : ISourceGenerator
             return;
         }
 
-        INamedTypeSymbol attributeSymbol = context.Compilation.GetTypeByMetadataName("DxMessaging.Core.Attributes.DxTargetedMessageAttribute");
+        INamedTypeSymbol attributeSymbol = context.Compilation.GetTypeByMetadataName(
+            "DxMessaging.Core.Attributes.DxTargetedMessageAttribute"
+        );
 
         foreach (TypeDeclarationSyntax classDeclaration in receiver.CandidateClasses)
         {
             SemanticModel model = context.Compilation.GetSemanticModel(classDeclaration.SyntaxTree);
             ISymbol classSymbol = ModelExtensions.GetDeclaredSymbol(model, classDeclaration);
 
-            if (classSymbol.GetAttributes().Any(
-                    attributeData => attributeData.AttributeClass.Equals(
-                        attributeSymbol, SymbolEqualityComparer.Default)))
+            if (
+                classSymbol
+                    .GetAttributes()
+                    .Any(attributeData =>
+                        attributeData.AttributeClass.Equals(
+                            attributeSymbol,
+                            SymbolEqualityComparer.Default
+                        )
+                    )
+            )
             {
                 string namespaceName = classSymbol.ContainingNamespace.ToDisplayString();
                 string className = classSymbol.Name;
-                string typeKind = classDeclaration.Kind() == SyntaxKind.ClassDeclaration ? "class" : "struct";
+                string typeKind =
+                    classDeclaration.Kind() == SyntaxKind.ClassDeclaration ? "class" : "struct";
 
                 string source = $$"""
 
-                                  namespace {{namespaceName}}
-                                  {
-                                      using DxMessaging.Core.Messages;
-                                  
-                                      public partial {{typeKind}} {{className}} : ITargetedMessage
-                                      {
-                                          public System.Type MessageType => typeof({{className}});
-                                      }
-                                  }
+                    namespace {{namespaceName}}
+                    {
+                        using DxMessaging.Core.Messages;
 
-                                  """;
+                        public partial {{typeKind}} {{className}} : ITargetedMessage
+                        {
+                            public System.Type MessageType => typeof({{className}});
+                        }
+                    }
+                    
+                    """;
 
-                context.AddSource($"{className}_DxTargetedMessage.g.cs", SourceText.From(source, Encoding.UTF8));
+                context.AddSource(
+                    $"{className}_DxTargetedMessage.g.cs",
+                    SourceText.From(source, Encoding.UTF8)
+                );
             }
         }
     }
@@ -65,13 +78,17 @@ public sealed class DxTargetedMessageGenerator : ISourceGenerator
         {
             if (syntaxNode is TypeDeclarationSyntax typeDeclarationSyntax)
             {
-                if (typeDeclarationSyntax.AttributeLists.Count > 0 &&
-                    (typeDeclarationSyntax.Kind() == SyntaxKind.ClassDeclaration ||
-                     typeDeclarationSyntax.Kind() == SyntaxKind.StructDeclaration))
+                if (
+                    typeDeclarationSyntax.AttributeLists.Count > 0
+                    && (
+                        typeDeclarationSyntax.Kind() == SyntaxKind.ClassDeclaration
+                        || typeDeclarationSyntax.Kind() == SyntaxKind.StructDeclaration
+                    )
+                )
                 {
                     CandidateClasses.Add(typeDeclarationSyntax);
                 }
             }
         }
     }
-}
+}

package/SourceGenerators/WallstopStudios.DxMessaging.SourceGenerators/DxUntargetedMessageGenerator.cs

@@ -11,7 +11,7 @@ using Microsoft.CodeAnalysis.Text;
 [Generator]
 public sealed class DxUntargetedMessageGenerator : ISourceGenerator
 {
-        public void Initialize(GeneratorInitializationContext context)
+    public void Initialize(GeneratorInitializationContext context)
     {
         context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
     }
@@ -23,36 +23,49 @@ public sealed class DxUntargetedMessageGenerator : ISourceGenerator
             return;
         }
 
-        INamedTypeSymbol attributeSymbol = context.Compilation.GetTypeByMetadataName("DxMessaging.Core.Attributes.DxUntargetedMessageAttribute");
+        INamedTypeSymbol attributeSymbol = context.Compilation.GetTypeByMetadataName(
+            "DxMessaging.Core.Attributes.DxUntargetedMessageAttribute"
+        );
 
         foreach (TypeDeclarationSyntax classDeclaration in receiver.CandidateClasses)
         {
             SemanticModel model = context.Compilation.GetSemanticModel(classDeclaration.SyntaxTree);
             ISymbol classSymbol = ModelExtensions.GetDeclaredSymbol(model, classDeclaration);
 
-            if (classSymbol.GetAttributes().Any(
-                    attributeData => attributeData.AttributeClass.Equals(
-                        attributeSymbol, SymbolEqualityComparer.Default)))
+            if (
+                classSymbol
+                    .GetAttributes()
+                    .Any(attributeData =>
+                        attributeData.AttributeClass.Equals(
+                            attributeSymbol,
+                            SymbolEqualityComparer.Default
+                        )
+                    )
+            )
             {
                 string namespaceName = classSymbol.ContainingNamespace.ToDisplayString();
                 string className = classSymbol.Name;
-                string typeKind = classDeclaration.Kind() == SyntaxKind.ClassDeclaration ? "class" : "struct";
+                string typeKind =
+                    classDeclaration.Kind() == SyntaxKind.ClassDeclaration ? "class" : "struct";
 
                 string source = $$"""
 
-                                  namespace {{namespaceName}}
-                                  {
-                                      using DxMessaging.Core.Messages;
-                                  
-                                      public partial {{typeKind}} {{className}} : IUntargetedMessage
-                                      {
-                                          public System.Type MessageType => typeof({{className}});
-                                      }
-                                  }
+                    namespace {{namespaceName}}
+                    {
+                        using DxMessaging.Core.Messages;
 
-                                  """;
+                        public partial {{typeKind}} {{className}} : IUntargetedMessage
+                        {
+                            public System.Type MessageType => typeof({{className}});
+                        }
+                    }
+                    
+                    """;
 
-                context.AddSource($"{className}_DxUntargetedMessage.g.cs", SourceText.From(source, Encoding.UTF8));
+                context.AddSource(
+                    $"{className}_DxUntargetedMessage.g.cs",
+                    SourceText.From(source, Encoding.UTF8)
+                );
             }
         }
     }
@@ -65,14 +78,17 @@ public sealed class DxUntargetedMessageGenerator : ISourceGenerator
         {
             if (syntaxNode is TypeDeclarationSyntax typeDeclarationSyntax)
             {
-                if (typeDeclarationSyntax.AttributeLists.Count > 0 &&
-                    (typeDeclarationSyntax.Kind() == SyntaxKind.ClassDeclaration ||
-                     typeDeclarationSyntax.Kind() == SyntaxKind.StructDeclaration))
+                if (
+                    typeDeclarationSyntax.AttributeLists.Count > 0
+                    && (
+                        typeDeclarationSyntax.Kind() == SyntaxKind.ClassDeclaration
+                        || typeDeclarationSyntax.Kind() == SyntaxKind.StructDeclaration
+                    )
+                )
                 {
                     CandidateClasses.Add(typeDeclarationSyntax);
                 }
             }
         }
     }
-
-}
+}

package/Tests/Runtime/Core/GlobalAcceptAllTests.cs

@@ -1,12 +1,12 @@
 namespace DxMessaging.Tests.Runtime.Core
 {
-    using DxMessaging.Core;
-    using Scripts.Components;
     using System;
     using System.Collections;
+    using DxMessaging.Core;
     using DxMessaging.Core.Extensions;
     using DxMessaging.Core.Messages;
     using NUnit.Framework;
+    using Scripts.Components;
     using Scripts.Messages;
     using UnityEngine;
     using UnityEngine.TestTools;
@@ -54,13 +54,19 @@
             SimpleTargetedMessage targetedMessage = new();
             SimpleBroadcastMessage broadcastMessage = new();
             RunGlobalAcceptAllTest(
-                token => token.RegisterGlobalAcceptAll(HandleUntargeted, HandleTargeted, HandleBroadcast),
+                token =>
+                    token.RegisterGlobalAcceptAll(
+                        HandleUntargeted,
+                        HandleTargeted,
+                        HandleBroadcast
+                    ),
                 i =>
                 {
                     Assert.AreEqual(i, untargetedCount);
                     untargetedMessage.EmitUntargeted();
                     Assert.AreEqual(i + 1, untargetedCount);
-                }, i =>
+                },
+                i =>
                 {
                     Assert.AreEqual(i, targetedCount);
                     if (_random.Next() % 2 == 0)
@@ -73,7 +79,8 @@
                     }
 
                     Assert.AreEqual(i + 1, targetedCount);
-                }, i =>
+                },
+                i =>
                 {
                     Assert.AreEqual(i, broadcastCount);
                     if (_random.Next() % 2 == 0)
@@ -86,7 +93,8 @@
                     }
 
                     Assert.AreEqual(i + 1, broadcastCount);
-                });
+                }
+            );
             yield break;
         }
 
@@ -116,13 +124,19 @@
             SimpleTargetedMessage targetedMessage = new();
             SimpleBroadcastMessage broadcastMessage = new();
             RunGlobalAcceptAllTest(
-                token => token.RegisterGlobalAcceptAll(HandleUntargeted, HandleTargeted, HandleBroadcast),
+                token =>
+                    token.RegisterGlobalAcceptAll(
+                        HandleUntargeted,
+                        HandleTargeted,
+                        HandleBroadcast
+                    ),
                 i =>
                 {
                     Assert.AreEqual(i, untargetedCount);
                     untargetedMessage.EmitUntargeted();
                     Assert.AreEqual(i + 1, untargetedCount);
-                }, i =>
+                },
+                i =>
                 {
                     Assert.AreEqual(i, targetedCount);
                     if (_random.Next() % 2 == 0)
@@ -135,7 +149,8 @@
                     }
 
                     Assert.AreEqual(i + 1, targetedCount);
-                }, i =>
+                },
+                i =>
                 {
                     Assert.AreEqual(i, broadcastCount);
                     if (_random.Next() % 2 == 0)
@@ -148,11 +163,17 @@
                     }
 
                     Assert.AreEqual(i + 1, broadcastCount);
-                });
+                }
+            );
             yield break;
         }
 
-        private void RunGlobalAcceptAllTest(Action<MessageRegistrationToken> register, Action<int> untargeted, Action<int> targeted, Action<int> broadcast)
+        private void RunGlobalAcceptAllTest(
+            Action<MessageRegistrationToken> register,
+            Action<int> untargeted,
+            Action<int> targeted,
+            Action<int> broadcast
+        )
         {
             EmptyMessageAwareComponent component = _test.GetComponent<EmptyMessageAwareComponent>();
             MessageRegistrationToken token = GetToken(component);

package/Tests/Runtime/Core/MessagingTestBase.cs

@@ -1,16 +1,16 @@
 namespace DxMessaging.Tests.Runtime.Core
 {
-    using DxMessaging.Core.MessageBus;
-    using DxMessaging.Core;
-    using NUnit.Framework;
-    using System.Collections.Generic;
-    using UnityEngine;
-    using Unity;
+    using System;
     using System.Collections;
+    using System.Collections.Generic;
     using System.Diagnostics;
     using System.Linq;
     using System.Reflection;
-    using System;
+    using DxMessaging.Core;
+    using DxMessaging.Core.MessageBus;
+    using NUnit.Framework;
+    using Unity;
+    using UnityEngine;
     using UnityEngine.TestTools;
     using Debug = UnityEngine.Debug;
     using Object = UnityEngine.Object;
@@ -69,7 +69,14 @@
             return WaitUntilMessageHandlerIsFresh();
         }
 
-        protected void Run(Func<IEnumerable<MessageRegistrationHandle>> register, Action emit, Action assert, Action finalAssert, MessageRegistrationToken token, bool synchronizeDeregistrations = false)
+        protected void Run(
+            Func<IEnumerable<MessageRegistrationHandle>> register,
+            Action emit,
+            Action assert,
+            Action finalAssert,
+            MessageRegistrationToken token,
+            bool synchronizeDeregistrations = false
+        )
         {
             HashSet<MessageRegistrationHandle> handles = new();
             try
@@ -88,7 +95,11 @@
 
                 if (synchronizeDeregistrations)
                 {
-                    foreach (int index in Enumerable.Range(0, indexedRegistrations.Count).OrderBy(_ => _random.Next()))
+                    foreach (
+                        int index in Enumerable
+                            .Range(0, indexedRegistrations.Count)
+                            .OrderBy(_ => _random.Next())
+                    )
                     {
                         emit();
                         assert();
@@ -101,7 +112,11 @@
                 }
                 else
                 {
-                    foreach (MessageRegistrationHandle handle in handles.OrderBy(_ => _random.Next()).ToList())
+                    foreach (
+                        MessageRegistrationHandle handle in handles
+                            .OrderBy(_ => _random.Next())
+                            .ToList()
+                    )
                     {
                         emit();
                         assert();
@@ -128,7 +143,9 @@
         {
             // Reach inside and grab the token
             FieldInfo field = typeof(MessageAwareComponent).GetField(
-                "_messageRegistrationToken", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                "_messageRegistrationToken",
+                BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic
+            );
             Assert.IsNotNull(field);
             MessageRegistrationToken token = field.GetValue(component) as MessageRegistrationToken;
             Assert.IsNotNull(token);
@@ -145,8 +162,9 @@
 
             bool IsStale()
             {
-                return messageBus.RegisteredUntargeted != 0 || messageBus.RegisteredTargeted != 0 ||
-                       messageBus.RegisteredBroadcast != 0;
+                return messageBus.RegisteredUntargeted != 0
+                    || messageBus.RegisteredTargeted != 0
+                    || messageBus.RegisteredBroadcast != 0;
             }
 
             while (IsStale() && timer.Elapsed < TimeSpan.FromSeconds(2.5))
@@ -157,8 +175,11 @@
             Assert.IsFalse(
                 IsStale(),
                 "MessageHandler had {0} Untargeted registrations, {1} Targeted registrations, {2} Broadcast registrations. Registration log: {3}.",
-                messageBus.RegisteredUntargeted, messageBus.RegisteredTargeted, messageBus.RegisteredBroadcast,
-                messageBus.Log);
+                messageBus.RegisteredUntargeted,
+                messageBus.RegisteredTargeted,
+                messageBus.RegisteredBroadcast,
+                messageBus.Log
+            );
         }
     }
 }