From a30abdb4c35675f92fd2f984394eba0ab7e5615c Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2026 06:04:45 +0000 Subject: [PATCH] refactor: simplify lambda expressions This PR refactors numerous lambda expressions by removing unnecessary braces and streamlining single-statement lambdas throughout the codebase, improving readability and maintainability. - Consider simplifying lambda when its body has a single statement: DeepSource flagged lambdas written with a block body for only one statement, causing extra verbosity. This update converts those to concise expression-bodied lambdas by stripping out the curly braces, applied across test assertions, event registrations, and unregister logic. The code is now cleaner and more consistent. > This Autofix was generated by AI. Please review the change before merging. --- .../coroutine/CommandCoroutineExtensionsTests.cs | 4 +--- GFramework.Core.Tests/events/EventTests.cs | 10 +++++----- GFramework.Core.Tests/events/OrEventTests.cs | 10 +++++----- GFramework.Core.Tests/events/UnRegisterTests.cs | 4 ++-- .../extensions/UnRegisterListExtensionTests.cs | 8 ++++---- GFramework.Core.Tests/logging/LoggerTests.cs | 2 +- GFramework.Core.Tests/tests/SyncArchitectureTests.cs | 4 ++-- GFramework.Core/events/EasyEvent.cs | 2 +- GFramework.Core/events/EasyEventGeneric.cs | 4 ++-- GFramework.Core/events/OrEvent.cs | 2 +- GFramework.Game/scene/SceneTransitionPipeline.cs | 5 +---- GFramework.Game/ui/UiTransitionPipeline.cs | 7 ++----- GFramework.Godot/coroutine/Timing.cs | 2 +- 13 files changed, 28 insertions(+), 36 deletions(-) diff --git a/GFramework.Core.Tests/coroutine/CommandCoroutineExtensionsTests.cs b/GFramework.Core.Tests/coroutine/CommandCoroutineExtensionsTests.cs index 2fc1f5c..d12d30d 100644 --- a/GFramework.Core.Tests/coroutine/CommandCoroutineExtensionsTests.cs +++ b/GFramework.Core.Tests/coroutine/CommandCoroutineExtensionsTests.cs @@ -412,13 +412,11 @@ public class CommandCoroutineExtensionsTests // 在创建协程时就应该抛出异常 Assert.Throws(() => - { CommandCoroutineExtensions.SendCommandAndWaitEventCoroutine( contextAware, command, null, - -1.0f); - }); + -1.0f)); } /// diff --git a/GFramework.Core.Tests/events/EventTests.cs b/GFramework.Core.Tests/events/EventTests.cs index fc4aac6..bf916ce 100644 --- a/GFramework.Core.Tests/events/EventTests.cs +++ b/GFramework.Core.Tests/events/EventTests.cs @@ -31,7 +31,7 @@ public class EventTests public void EasyEvent_Register_Should_Add_Handler() { var called = false; - _easyEvent.Register(() => { called = true; }); + _easyEvent.Register(() => called = true); _easyEvent.Trigger(); @@ -45,7 +45,7 @@ public class EventTests public void EasyEvent_UnRegister_Should_Remove_Handler() { var count = 0; - var handler = () => { count++; }; + var handler = () => count++; _easyEvent.Register(handler); _easyEvent.Trigger(); @@ -65,8 +65,8 @@ public class EventTests var count1 = 0; var count2 = 0; - _easyEvent.Register(() => { count1++; }); - _easyEvent.Register(() => { count2++; }); + _easyEvent.Register(() => count1++); + _easyEvent.Register(() => count2++); _easyEvent.Trigger(); @@ -151,7 +151,7 @@ public class EventTests public void EventTTK_UnRegister_Should_Remove_Handler() { var count = 0; - Action handler = (i, s) => { count++; }; + Action handler = (i, s) => count++; _eventIntString.Register(handler); _eventIntString.Trigger(1, "a"); diff --git a/GFramework.Core.Tests/events/OrEventTests.cs b/GFramework.Core.Tests/events/OrEventTests.cs index 5936351..5f0ad21 100644 --- a/GFramework.Core.Tests/events/OrEventTests.cs +++ b/GFramework.Core.Tests/events/OrEventTests.cs @@ -21,7 +21,7 @@ public class OrEventTests var orEvent = new OrEvent(); var triggered = false; - orEvent.Register(() => { triggered = true; }); + orEvent.Register(() => triggered = true); // 将两个事件添加到OrEvent中 orEvent.Or(event1).Or(event2); @@ -43,7 +43,7 @@ public class OrEventTests var orEvent = new OrEvent(); var triggered = false; - orEvent.Register(() => { triggered = true; }); + orEvent.Register(() => triggered = true); // 将两个事件添加到OrEvent中 orEvent.Or(event1).Or(event2); @@ -66,8 +66,8 @@ public class OrEventTests var count1 = 0; var count2 = 0; - orEvent.Register(() => { count1++; }); - orEvent.Register(() => { count2++; }); + orEvent.Register(() => count1++); + orEvent.Register(() => count2++); // 将事件添加到OrEvent中 orEvent.Or(@event); @@ -88,7 +88,7 @@ public class OrEventTests var orEvent = new OrEvent(); var count = 0; - var handler = () => { count++; }; + var handler = () => count++; orEvent.Register(handler); orEvent.Or(@event); diff --git a/GFramework.Core.Tests/events/UnRegisterTests.cs b/GFramework.Core.Tests/events/UnRegisterTests.cs index 74b990a..ac87b7f 100644 --- a/GFramework.Core.Tests/events/UnRegisterTests.cs +++ b/GFramework.Core.Tests/events/UnRegisterTests.cs @@ -17,7 +17,7 @@ public class UnRegisterTests public void DefaultUnRegister_Should_InvokeCallback_When_UnRegisterCalled() { var invoked = false; - var unRegister = new DefaultUnRegister(() => { invoked = true; }); + var unRegister = new DefaultUnRegister(() => invoked = true); unRegister.UnRegister(); @@ -31,7 +31,7 @@ public class UnRegisterTests public void DefaultUnRegister_Should_ClearCallback_After_UnRegister() { var callCount = 0; - var unRegister = new DefaultUnRegister(() => { callCount++; }); + var unRegister = new DefaultUnRegister(() => callCount++); unRegister.UnRegister(); unRegister.UnRegister(); diff --git a/GFramework.Core.Tests/extensions/UnRegisterListExtensionTests.cs b/GFramework.Core.Tests/extensions/UnRegisterListExtensionTests.cs index 404c87a..886696c 100644 --- a/GFramework.Core.Tests/extensions/UnRegisterListExtensionTests.cs +++ b/GFramework.Core.Tests/extensions/UnRegisterListExtensionTests.cs @@ -62,9 +62,9 @@ public class UnRegisterListExtensionTests var invoked2 = false; var invoked3 = false; - var unRegister1 = new DefaultUnRegister(() => { invoked1 = true; }); - var unRegister2 = new DefaultUnRegister(() => { invoked2 = true; }); - var unRegister3 = new DefaultUnRegister(() => { invoked3 = true; }); + var unRegister1 = new DefaultUnRegister(() => invoked1 = true); + var unRegister2 = new DefaultUnRegister(() => invoked2 = true); + var unRegister3 = new DefaultUnRegister(() => invoked3 = true); unRegister1.AddToUnregisterList(_unRegisterList); unRegister2.AddToUnregisterList(_unRegisterList); @@ -109,7 +109,7 @@ public class UnRegisterListExtensionTests public void UnRegisterAll_Should_Invoke_Once_Per_Element() { var callCount = 0; - var unRegister = new DefaultUnRegister(() => { callCount++; }); + var unRegister = new DefaultUnRegister(() => callCount++); unRegister.AddToUnregisterList(_unRegisterList); diff --git a/GFramework.Core.Tests/logging/LoggerTests.cs b/GFramework.Core.Tests/logging/LoggerTests.cs index a14f34b..0a5df74 100644 --- a/GFramework.Core.Tests/logging/LoggerTests.cs +++ b/GFramework.Core.Tests/logging/LoggerTests.cs @@ -118,7 +118,7 @@ public class LoggerTests [Test] public void IsEnabledForLevel_WithInvalidLevel_Should_ThrowArgumentException() { - Assert.Throws(() => { _logger.IsEnabledForLevel((LogLevel)999); }); + Assert.Throws(() => _logger.IsEnabledForLevel((LogLevel)999)); } /// diff --git a/GFramework.Core.Tests/tests/SyncArchitectureTests.cs b/GFramework.Core.Tests/tests/SyncArchitectureTests.cs index 332666d..e9488c6 100644 --- a/GFramework.Core.Tests/tests/SyncArchitectureTests.cs +++ b/GFramework.Core.Tests/tests/SyncArchitectureTests.cs @@ -96,7 +96,7 @@ public class SyncArchitectureTests : ArchitectureTestsBase { Architecture!.Initialize(); - Assert.Throws(() => { Architecture.RegisterSystem(new TestSystem()); }); + Assert.Throws(() => Architecture.RegisterSystem(new TestSystem())); } /// @@ -107,7 +107,7 @@ public class SyncArchitectureTests : ArchitectureTestsBase { Architecture!.Initialize(); - Assert.Throws(() => { Architecture.RegisterModel(new TestModel()); }); + Assert.Throws(() => Architecture.RegisterModel(new TestModel())); } /// diff --git a/GFramework.Core/events/EasyEvent.cs b/GFramework.Core/events/EasyEvent.cs index d0b2625..46ec01f 100644 --- a/GFramework.Core/events/EasyEvent.cs +++ b/GFramework.Core/events/EasyEvent.cs @@ -17,7 +17,7 @@ public class EasyEvent public IUnRegister Register(Action onEvent) { _mOnEvent += onEvent; - return new DefaultUnRegister(() => { UnRegister(onEvent); }); + return new DefaultUnRegister(() => UnRegister(onEvent)); } /// diff --git a/GFramework.Core/events/EasyEventGeneric.cs b/GFramework.Core/events/EasyEventGeneric.cs index 07af5a1..002678c 100644 --- a/GFramework.Core/events/EasyEventGeneric.cs +++ b/GFramework.Core/events/EasyEventGeneric.cs @@ -39,7 +39,7 @@ public class Event : IEvent public IUnRegister Register(Action onEvent) { _mOnEvent += onEvent; - return new DefaultUnRegister(() => { UnRegister(onEvent); }); + return new DefaultUnRegister(() => UnRegister(onEvent)); } /// @@ -99,7 +99,7 @@ public class Event : IEvent public IUnRegister Register(Action onEvent) { _mOnEvent += onEvent; - return new DefaultUnRegister(() => { UnRegister(onEvent); }); + return new DefaultUnRegister(() => UnRegister(onEvent)); } /// diff --git a/GFramework.Core/events/OrEvent.cs b/GFramework.Core/events/OrEvent.cs index 1f79e63..767f2db 100644 --- a/GFramework.Core/events/OrEvent.cs +++ b/GFramework.Core/events/OrEvent.cs @@ -34,7 +34,7 @@ public class OrEvent : IUnRegisterList public IUnRegister Register(Action onEvent) { _mOnEvent += onEvent; - return new DefaultUnRegister(() => { UnRegister(onEvent); }); + return new DefaultUnRegister(() => UnRegister(onEvent)); } /// diff --git a/GFramework.Game/scene/SceneTransitionPipeline.cs b/GFramework.Game/scene/SceneTransitionPipeline.cs index 7f94684..1cf394d 100644 --- a/GFramework.Game/scene/SceneTransitionPipeline.cs +++ b/GFramework.Game/scene/SceneTransitionPipeline.cs @@ -191,11 +191,8 @@ public class SceneTransitionPipeline var options = _aroundOptions[handler]; var next = pipeline; - pipeline = async () => - { - await ExecuteSingleAroundHandlerAsync( + pipeline = async () => await ExecuteSingleAroundHandlerAsync( handler, options, @event, next, cancellationToken); - }; } await pipeline(); diff --git a/GFramework.Game/ui/UiTransitionPipeline.cs b/GFramework.Game/ui/UiTransitionPipeline.cs index cd4f000..8a878fd 100644 --- a/GFramework.Game/ui/UiTransitionPipeline.cs +++ b/GFramework.Game/ui/UiTransitionPipeline.cs @@ -176,11 +176,8 @@ public class UiTransitionPipeline var options = _aroundOptions[handler]; var next = pipeline; - pipeline = async () => - { - await ExecuteSingleAroundHandlerAsync( - handler, options, @event, next, cancellationToken); - }; + pipeline = async () => await ExecuteSingleAroundHandlerAsync( + handler, options, @event, next, cancellationToken); } await pipeline(); diff --git a/GFramework.Godot/coroutine/Timing.cs b/GFramework.Godot/coroutine/Timing.cs index 4d6fbd8..4d4542b 100644 --- a/GFramework.Godot/coroutine/Timing.cs +++ b/GFramework.Godot/coroutine/Timing.cs @@ -82,7 +82,7 @@ public partial class Timing : Node { Name = nameof(Timing) }; - tree.Root.WaitUntilReady(() => { tree.Root.AddChild(_instance); }); + tree.Root.WaitUntilReady(() => tree.Root.AddChild(_instance)); return _instance; }