Fixup code style

Edvinas01 · Edvinas01 · commit 37943a8d9e6b · 2020-10-03T13:00:43.000+02:00
diff --git a/Editor/GameEvents/Game/GameEventEditor.cs b/Editor/GameEvents/Game/GameEventEditor.cs
@@ -21,7 +21,10 @@ public override void OnInspectorGUI()
             base.OnInspectorGUI();
 
             var gameEvent = target as GameEvent;
-            if (gameEvent == null) return;
+            if (gameEvent == null)
+            {
+                return;
+            }
 
             GUI.enabled = Application.isPlaying;
             GUILayout.Space(GroupSpacingPixels);
@@ -32,7 +35,10 @@ public override void OnInspectorGUI()
         private static void DrawRaise(IGameEvent gameEvent)
         {
             GUILayout.Label("Raise event (play mode only)");
-            if (GUILayout.Button("Raise")) gameEvent.RaiseGameEvent();
+            if (GUILayout.Button("Raise"))
+            {
+                gameEvent.RaiseGameEvent();
+            }
         }
 
         #endregion
diff --git a/Editor/GameEvents/Generic/ArgumentGameEventEditor.cs b/Editor/GameEvents/Generic/ArgumentGameEventEditor.cs
@@ -4,8 +4,8 @@
 namespace GameEvents.Generic
 {
     [CanEditMultipleObjects]
-    public abstract class ArgumentGameEventEditor<TGameEvent, TArgument>
-        : Editor where TGameEvent : class, IArgumentGameEvent<TArgument>
+    public abstract class ArgumentGameEventEditor<TGameEvent, TArgument> : Editor
+        where TGameEvent : class, IArgumentGameEvent<TArgument>
     {
         #region Protected Methods
 
@@ -33,7 +33,10 @@ public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
 
-            if (!(target is TGameEvent gameEvent)) return;
+            if (!(target is TGameEvent gameEvent))
+            {
+                return;
+            }
 
             GUI.enabled = Application.isPlaying;
             GUILayout.Space(GroupSpacingPixels);
@@ -47,7 +50,10 @@ private void DrawRaise(TGameEvent gameEvent)
             GUILayout.BeginHorizontal();
 
             argumentValue = DrawArgumentField(argumentValue);
-            if (GUILayout.Button("Raise")) gameEvent.RaiseGameEvent(argumentValue);
+            if (GUILayout.Button("Raise"))
+            {
+                gameEvent.RaiseGameEvent(argumentValue);
+            }
 
             GUILayout.EndHorizontal();
         }
diff --git a/Runtime/GameEvents/Game/GameEvent.cs b/Runtime/GameEvents/Game/GameEvent.cs
@@ -22,27 +22,39 @@ public class GameEvent : ScriptableObject, IGameEvent
 
         public void RaiseGameEvent()
         {
-            if (debug) Debug.Log($"Raise event: {name}");
+            if (debug)
+            {
+                Debug.Log($"Raise event: {name}");
+            }
 
             for (var i = listeners.Count - 1; i >= 0; i--)
             {
                 var listener = listeners[i];
-                if (debug) Debug.Log($"Raise event: {name}, listener: {listener}");
+                if (debug)
+                {
+                    Debug.Log($"Raise event: {name}, listener: {listener}");
+                }
 
                 listener.OnGameEvent();
             }
         }
 
         public void RegisterListener(IGameEventListener listener)
         {
-            if (debug) Debug.Log($"Registering listener: {listener}");
+            if (debug)
+            {
+                Debug.Log($"Registering listener: {listener}");
+            }
 
             listeners.Add(listener);
         }
 
         public void UnregisterListener(IGameEventListener listener)
         {
-            if (debug) Debug.Log($"Unregistering listener: {listener}");
+            if (debug)
+            {
+                Debug.Log($"Unregistering listener: {listener}");
+            }
 
             listeners.Remove(listener);
         }
diff --git a/Runtime/GameEvents/Generic/ArgumentGameEvent.cs b/Runtime/GameEvents/Generic/ArgumentGameEvent.cs
@@ -3,8 +3,8 @@
 
 namespace GameEvents.Generic
 {
-    public abstract class ArgumentGameEvent<TArgument> : ScriptableObject,
-        IArgumentGameEvent<TArgument>
+    public abstract class ArgumentGameEvent<TArgument>
+        : ScriptableObject, IArgumentGameEvent<TArgument>
     {
         #region Private Fields
 
@@ -21,28 +21,39 @@ public abstract class ArgumentGameEvent<TArgument> : ScriptableObject,
 
         public void RaiseGameEvent(TArgument argument)
         {
-            if (debug) Debug.Log($"Raise event: {name} with an argument: {argument}");
+            if (debug)
+            {
+                Debug.Log($"Raise event: {name} with an argument: {argument}");
+            }
 
             for (var i = listeners.Count - 1; i >= 0; i--)
             {
                 var listener = listeners[i];
                 if (debug)
+                {
                     Debug.Log($"Raise event: {name}, listener: {listener}, argument: {argument}");
+                }
 
                 listener.OnGameEvent(argument);
             }
         }
 
         public void RegisterListener(IArgumentGameEventListener<TArgument> listener)
         {
-            if (debug) Debug.Log($"Registering listener: {listener}");
+            if (debug)
+            {
+                Debug.Log($"Registering listener: {listener}");
+            }
 
             listeners.Add(listener);
         }
 
         public void UnregisterListener(IArgumentGameEventListener<TArgument> listener)
         {
-            if (debug) Debug.Log($"Unregistering listener: {listener}");
+            if (debug)
+            {
+                Debug.Log($"Unregistering listener: {listener}");
+            }
 
             listeners.Remove(listener);
         }
diff --git a/Runtime/GameEvents/Generic/ArgumentGameEventListener.cs b/Runtime/GameEvents/Generic/ArgumentGameEventListener.cs
@@ -41,7 +41,9 @@ private void OnEnable()
             if (gameEvent == null)
             {
                 Debug.LogWarning(
-                    $"Game Event ({typeof(TGameEvent).Name}) on listener {name} is not set");
+                    $"Game Event ({typeof(TGameEvent).Name}) on listener {name} is not set"
+                );
+
                 return;
             }
 
@@ -53,7 +55,9 @@ private void OnDisable()
             if (gameEvent == null)
             {
                 Debug.LogWarning(
-                    $"Game Event ({typeof(TGameEvent).Name}) on listener {name} is not set");
+                    $"Game Event ({typeof(TGameEvent).Name}) on listener {name} is not set"
+                );
+
                 return;
             }
 
diff --git a/Runtime/GameEvents/Transform/TransformGameEvent.cs b/Runtime/GameEvents/Transform/TransformGameEvent.cs
@@ -3,8 +3,10 @@
 
 namespace GameEvents.Transform
 {
-    [CreateAssetMenu(fileName = "TransformGameEvent",
-        menuName = "Game Events/Transform Game Event")]
+    [CreateAssetMenu(
+        fileName = "TransformGameEvent",
+        menuName = "Game Events/Transform Game Event"
+    )]
     public class TransformGameEvent : ArgumentGameEvent<UnityEngine.Transform>
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -22,27 +22,39 @@ public class GameEvent : ScriptableObject, IGameEvent`
`22`	`22`
`23`	`23`	`public void RaiseGameEvent()`
`24`	`24`	`{`
`25`		`- if (debug) Debug.Log($"Raise event: {name}");`
	`25`	`+ if (debug)`
	`26`	`+ {`
	`27`	`+ Debug.Log($"Raise event: {name}");`
	`28`	`+ }`
`26`	`29`
`27`	`30`	`for (var i = listeners.Count - 1; i >= 0; i--)`
`28`	`31`	`{`
`29`	`32`	`var listener = listeners[i];`
`30`		`- if (debug) Debug.Log($"Raise event: {name}, listener: {listener}");`
	`33`	`+ if (debug)`
	`34`	`+ {`
	`35`	`+ Debug.Log($"Raise event: {name}, listener: {listener}");`
	`36`	`+ }`
`31`	`37`
`32`	`38`	`listener.OnGameEvent();`
`33`	`39`	`}`
`34`	`40`	`}`
`35`	`41`
`36`	`42`	`public void RegisterListener(IGameEventListener listener)`
`37`	`43`	`{`
`38`		`- if (debug) Debug.Log($"Registering listener: {listener}");`
	`44`	`+ if (debug)`
	`45`	`+ {`
	`46`	`+ Debug.Log($"Registering listener: {listener}");`
	`47`	`+ }`
`39`	`48`
`40`	`49`	`listeners.Add(listener);`
`41`	`50`	`}`
`42`	`51`
`43`	`52`	`public void UnregisterListener(IGameEventListener listener)`
`44`	`53`	`{`
`45`		`- if (debug) Debug.Log($"Unregistering listener: {listener}");`
	`54`	`+ if (debug)`
	`55`	`+ {`
	`56`	`+ Debug.Log($"Unregistering listener: {listener}");`
	`57`	`+ }`
`46`	`58`
`47`	`59`	`listeners.Remove(listener);`
`48`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace GameEvents.Generic`
`5`	`5`	`{`
`6`		`- public abstract class ArgumentGameEvent<TArgument> : ScriptableObject,`
`7`		`- IArgumentGameEvent<TArgument>`
	`6`	`+ public abstract class ArgumentGameEvent<TArgument>`
	`7`	`+ : ScriptableObject, IArgumentGameEvent<TArgument>`
`8`	`8`	`{`
`9`	`9`	`#region Private Fields`
`10`	`10`
`@@ -21,28 +21,39 @@ public abstract class ArgumentGameEvent<TArgument> : ScriptableObject,`
`21`	`21`
`22`	`22`	`public void RaiseGameEvent(TArgument argument)`
`23`	`23`	`{`
`24`		`- if (debug) Debug.Log($"Raise event: {name} with an argument: {argument}");`
	`24`	`+ if (debug)`
	`25`	`+ {`
	`26`	`+ Debug.Log($"Raise event: {name} with an argument: {argument}");`
	`27`	`+ }`
`25`	`28`
`26`	`29`	`for (var i = listeners.Count - 1; i >= 0; i--)`
`27`	`30`	`{`
`28`	`31`	`var listener = listeners[i];`
`29`	`32`	`if (debug)`
	`33`	`+ {`
`30`	`34`	`Debug.Log($"Raise event: {name}, listener: {listener}, argument: {argument}");`
	`35`	`+ }`
`31`	`36`
`32`	`37`	`listener.OnGameEvent(argument);`
`33`	`38`	`}`
`34`	`39`	`}`
`35`	`40`
`36`	`41`	`public void RegisterListener(IArgumentGameEventListener<TArgument> listener)`
`37`	`42`	`{`
`38`		`- if (debug) Debug.Log($"Registering listener: {listener}");`
	`43`	`+ if (debug)`
	`44`	`+ {`
	`45`	`+ Debug.Log($"Registering listener: {listener}");`
	`46`	`+ }`
`39`	`47`
`40`	`48`	`listeners.Add(listener);`
`41`	`49`	`}`
`42`	`50`
`43`	`51`	`public void UnregisterListener(IArgumentGameEventListener<TArgument> listener)`
`44`	`52`	`{`
`45`		`- if (debug) Debug.Log($"Unregistering listener: {listener}");`
	`53`	`+ if (debug)`
	`54`	`+ {`
	`55`	`+ Debug.Log($"Unregistering listener: {listener}");`
	`56`	`+ }`
`46`	`57`
`47`	`58`	`listeners.Remove(listener);`
`48`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,9 @@ private void OnEnable()`
`41`	`41`	`if (gameEvent == null)`
`42`	`42`	`{`
`43`	`43`	`Debug.LogWarning(`
`44`		`- $"Game Event ({typeof(TGameEvent).Name}) on listener {name} is not set");`
	`44`	`+ $"Game Event ({typeof(TGameEvent).Name}) on listener {name} is not set"`
	`45`	`+ );`
	`46`	`+`
`45`	`47`	`return;`
`46`	`48`	`}`
`47`	`49`
`@@ -53,7 +55,9 @@ private void OnDisable()`
`53`	`55`	`if (gameEvent == null)`
`54`	`56`	`{`
`55`	`57`	`Debug.LogWarning(`
`56`		`- $"Game Event ({typeof(TGameEvent).Name}) on listener {name} is not set");`
	`58`	`+ $"Game Event ({typeof(TGameEvent).Name}) on listener {name} is not set"`
	`59`	`+ );`
	`60`	`+`
`57`	`61`	`return;`
`58`	`62`	`}`
`59`	`63`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,10 @@`
`3`	`3`
`4`	`4`	`namespace GameEvents.Transform`
`5`	`5`	`{`
`6`		`- [CreateAssetMenu(fileName = "TransformGameEvent",`
`7`		`- menuName = "Game Events/Transform Game Event")]`
	`6`	`+ [CreateAssetMenu(`
	`7`	`+ fileName = "TransformGameEvent",`
	`8`	`+ menuName = "Game Events/Transform Game Event"`
	`9`	`+ )]`
`8`	`10`	`public class TransformGameEvent : ArgumentGameEvent<UnityEngine.Transform>`
`9`	`11`	`{`
`10`	`12`	`}`