mirror of
https://github.com/GeWuYou/GFramework.git
synced 2026-03-25 04:59:01 +08:00
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.
This commit is contained in:
parent
50c73a7d7c
commit
a30abdb4c3
@ -412,13 +412,11 @@ public class CommandCoroutineExtensionsTests
|
|||||||
|
|
||||||
// 在创建协程时就应该抛出异常
|
// 在创建协程时就应该抛出异常
|
||||||
Assert.Throws<ArgumentOutOfRangeException>(() =>
|
Assert.Throws<ArgumentOutOfRangeException>(() =>
|
||||||
{
|
|
||||||
CommandCoroutineExtensions.SendCommandAndWaitEventCoroutine<TestCommand, TestEvent>(
|
CommandCoroutineExtensions.SendCommandAndWaitEventCoroutine<TestCommand, TestEvent>(
|
||||||
contextAware,
|
contextAware,
|
||||||
command,
|
command,
|
||||||
null,
|
null,
|
||||||
-1.0f);
|
-1.0f));
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -31,7 +31,7 @@ public class EventTests
|
|||||||
public void EasyEvent_Register_Should_Add_Handler()
|
public void EasyEvent_Register_Should_Add_Handler()
|
||||||
{
|
{
|
||||||
var called = false;
|
var called = false;
|
||||||
_easyEvent.Register(() => { called = true; });
|
_easyEvent.Register(() => called = true);
|
||||||
|
|
||||||
_easyEvent.Trigger();
|
_easyEvent.Trigger();
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ public class EventTests
|
|||||||
public void EasyEvent_UnRegister_Should_Remove_Handler()
|
public void EasyEvent_UnRegister_Should_Remove_Handler()
|
||||||
{
|
{
|
||||||
var count = 0;
|
var count = 0;
|
||||||
var handler = () => { count++; };
|
var handler = () => count++;
|
||||||
|
|
||||||
_easyEvent.Register(handler);
|
_easyEvent.Register(handler);
|
||||||
_easyEvent.Trigger();
|
_easyEvent.Trigger();
|
||||||
@ -65,8 +65,8 @@ public class EventTests
|
|||||||
var count1 = 0;
|
var count1 = 0;
|
||||||
var count2 = 0;
|
var count2 = 0;
|
||||||
|
|
||||||
_easyEvent.Register(() => { count1++; });
|
_easyEvent.Register(() => count1++);
|
||||||
_easyEvent.Register(() => { count2++; });
|
_easyEvent.Register(() => count2++);
|
||||||
|
|
||||||
_easyEvent.Trigger();
|
_easyEvent.Trigger();
|
||||||
|
|
||||||
@ -151,7 +151,7 @@ public class EventTests
|
|||||||
public void EventTTK_UnRegister_Should_Remove_Handler()
|
public void EventTTK_UnRegister_Should_Remove_Handler()
|
||||||
{
|
{
|
||||||
var count = 0;
|
var count = 0;
|
||||||
Action<int, string> handler = (i, s) => { count++; };
|
Action<int, string> handler = (i, s) => count++;
|
||||||
|
|
||||||
_eventIntString.Register(handler);
|
_eventIntString.Register(handler);
|
||||||
_eventIntString.Trigger(1, "a");
|
_eventIntString.Trigger(1, "a");
|
||||||
|
|||||||
@ -21,7 +21,7 @@ public class OrEventTests
|
|||||||
var orEvent = new OrEvent();
|
var orEvent = new OrEvent();
|
||||||
|
|
||||||
var triggered = false;
|
var triggered = false;
|
||||||
orEvent.Register(() => { triggered = true; });
|
orEvent.Register(() => triggered = true);
|
||||||
|
|
||||||
// 将两个事件添加到OrEvent中
|
// 将两个事件添加到OrEvent中
|
||||||
orEvent.Or(event1).Or(event2);
|
orEvent.Or(event1).Or(event2);
|
||||||
@ -43,7 +43,7 @@ public class OrEventTests
|
|||||||
var orEvent = new OrEvent();
|
var orEvent = new OrEvent();
|
||||||
|
|
||||||
var triggered = false;
|
var triggered = false;
|
||||||
orEvent.Register(() => { triggered = true; });
|
orEvent.Register(() => triggered = true);
|
||||||
|
|
||||||
// 将两个事件添加到OrEvent中
|
// 将两个事件添加到OrEvent中
|
||||||
orEvent.Or(event1).Or(event2);
|
orEvent.Or(event1).Or(event2);
|
||||||
@ -66,8 +66,8 @@ public class OrEventTests
|
|||||||
var count1 = 0;
|
var count1 = 0;
|
||||||
var count2 = 0;
|
var count2 = 0;
|
||||||
|
|
||||||
orEvent.Register(() => { count1++; });
|
orEvent.Register(() => count1++);
|
||||||
orEvent.Register(() => { count2++; });
|
orEvent.Register(() => count2++);
|
||||||
|
|
||||||
// 将事件添加到OrEvent中
|
// 将事件添加到OrEvent中
|
||||||
orEvent.Or(@event);
|
orEvent.Or(@event);
|
||||||
@ -88,7 +88,7 @@ public class OrEventTests
|
|||||||
var orEvent = new OrEvent();
|
var orEvent = new OrEvent();
|
||||||
|
|
||||||
var count = 0;
|
var count = 0;
|
||||||
var handler = () => { count++; };
|
var handler = () => count++;
|
||||||
|
|
||||||
orEvent.Register(handler);
|
orEvent.Register(handler);
|
||||||
orEvent.Or(@event);
|
orEvent.Or(@event);
|
||||||
|
|||||||
@ -17,7 +17,7 @@ public class UnRegisterTests
|
|||||||
public void DefaultUnRegister_Should_InvokeCallback_When_UnRegisterCalled()
|
public void DefaultUnRegister_Should_InvokeCallback_When_UnRegisterCalled()
|
||||||
{
|
{
|
||||||
var invoked = false;
|
var invoked = false;
|
||||||
var unRegister = new DefaultUnRegister(() => { invoked = true; });
|
var unRegister = new DefaultUnRegister(() => invoked = true);
|
||||||
|
|
||||||
unRegister.UnRegister();
|
unRegister.UnRegister();
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ public class UnRegisterTests
|
|||||||
public void DefaultUnRegister_Should_ClearCallback_After_UnRegister()
|
public void DefaultUnRegister_Should_ClearCallback_After_UnRegister()
|
||||||
{
|
{
|
||||||
var callCount = 0;
|
var callCount = 0;
|
||||||
var unRegister = new DefaultUnRegister(() => { callCount++; });
|
var unRegister = new DefaultUnRegister(() => callCount++);
|
||||||
|
|
||||||
unRegister.UnRegister();
|
unRegister.UnRegister();
|
||||||
unRegister.UnRegister();
|
unRegister.UnRegister();
|
||||||
|
|||||||
@ -62,9 +62,9 @@ public class UnRegisterListExtensionTests
|
|||||||
var invoked2 = false;
|
var invoked2 = false;
|
||||||
var invoked3 = false;
|
var invoked3 = false;
|
||||||
|
|
||||||
var unRegister1 = new DefaultUnRegister(() => { invoked1 = true; });
|
var unRegister1 = new DefaultUnRegister(() => invoked1 = true);
|
||||||
var unRegister2 = new DefaultUnRegister(() => { invoked2 = true; });
|
var unRegister2 = new DefaultUnRegister(() => invoked2 = true);
|
||||||
var unRegister3 = new DefaultUnRegister(() => { invoked3 = true; });
|
var unRegister3 = new DefaultUnRegister(() => invoked3 = true);
|
||||||
|
|
||||||
unRegister1.AddToUnregisterList(_unRegisterList);
|
unRegister1.AddToUnregisterList(_unRegisterList);
|
||||||
unRegister2.AddToUnregisterList(_unRegisterList);
|
unRegister2.AddToUnregisterList(_unRegisterList);
|
||||||
@ -109,7 +109,7 @@ public class UnRegisterListExtensionTests
|
|||||||
public void UnRegisterAll_Should_Invoke_Once_Per_Element()
|
public void UnRegisterAll_Should_Invoke_Once_Per_Element()
|
||||||
{
|
{
|
||||||
var callCount = 0;
|
var callCount = 0;
|
||||||
var unRegister = new DefaultUnRegister(() => { callCount++; });
|
var unRegister = new DefaultUnRegister(() => callCount++);
|
||||||
|
|
||||||
unRegister.AddToUnregisterList(_unRegisterList);
|
unRegister.AddToUnregisterList(_unRegisterList);
|
||||||
|
|
||||||
|
|||||||
@ -118,7 +118,7 @@ public class LoggerTests
|
|||||||
[Test]
|
[Test]
|
||||||
public void IsEnabledForLevel_WithInvalidLevel_Should_ThrowArgumentException()
|
public void IsEnabledForLevel_WithInvalidLevel_Should_ThrowArgumentException()
|
||||||
{
|
{
|
||||||
Assert.Throws<ArgumentException>(() => { _logger.IsEnabledForLevel((LogLevel)999); });
|
Assert.Throws<ArgumentException>(() => _logger.IsEnabledForLevel((LogLevel)999));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -96,7 +96,7 @@ public class SyncArchitectureTests : ArchitectureTestsBase<SyncTestArchitecture>
|
|||||||
{
|
{
|
||||||
Architecture!.Initialize();
|
Architecture!.Initialize();
|
||||||
|
|
||||||
Assert.Throws<InvalidOperationException>(() => { Architecture.RegisterSystem(new TestSystem()); });
|
Assert.Throws<InvalidOperationException>(() => Architecture.RegisterSystem(new TestSystem()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -107,7 +107,7 @@ public class SyncArchitectureTests : ArchitectureTestsBase<SyncTestArchitecture>
|
|||||||
{
|
{
|
||||||
Architecture!.Initialize();
|
Architecture!.Initialize();
|
||||||
|
|
||||||
Assert.Throws<InvalidOperationException>(() => { Architecture.RegisterModel(new TestModel()); });
|
Assert.Throws<InvalidOperationException>(() => Architecture.RegisterModel(new TestModel()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -17,7 +17,7 @@ public class EasyEvent
|
|||||||
public IUnRegister Register(Action onEvent)
|
public IUnRegister Register(Action onEvent)
|
||||||
{
|
{
|
||||||
_mOnEvent += onEvent;
|
_mOnEvent += onEvent;
|
||||||
return new DefaultUnRegister(() => { UnRegister(onEvent); });
|
return new DefaultUnRegister(() => UnRegister(onEvent));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -39,7 +39,7 @@ public class Event<T> : IEvent
|
|||||||
public IUnRegister Register(Action<T> onEvent)
|
public IUnRegister Register(Action<T> onEvent)
|
||||||
{
|
{
|
||||||
_mOnEvent += onEvent;
|
_mOnEvent += onEvent;
|
||||||
return new DefaultUnRegister(() => { UnRegister(onEvent); });
|
return new DefaultUnRegister(() => UnRegister(onEvent));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -99,7 +99,7 @@ public class Event<T, Tk> : IEvent
|
|||||||
public IUnRegister Register(Action<T, Tk> onEvent)
|
public IUnRegister Register(Action<T, Tk> onEvent)
|
||||||
{
|
{
|
||||||
_mOnEvent += onEvent;
|
_mOnEvent += onEvent;
|
||||||
return new DefaultUnRegister(() => { UnRegister(onEvent); });
|
return new DefaultUnRegister(() => UnRegister(onEvent));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -34,7 +34,7 @@ public class OrEvent : IUnRegisterList
|
|||||||
public IUnRegister Register(Action onEvent)
|
public IUnRegister Register(Action onEvent)
|
||||||
{
|
{
|
||||||
_mOnEvent += onEvent;
|
_mOnEvent += onEvent;
|
||||||
return new DefaultUnRegister(() => { UnRegister(onEvent); });
|
return new DefaultUnRegister(() => UnRegister(onEvent));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -191,11 +191,8 @@ public class SceneTransitionPipeline
|
|||||||
var options = _aroundOptions[handler];
|
var options = _aroundOptions[handler];
|
||||||
var next = pipeline;
|
var next = pipeline;
|
||||||
|
|
||||||
pipeline = async () =>
|
pipeline = async () => await ExecuteSingleAroundHandlerAsync(
|
||||||
{
|
|
||||||
await ExecuteSingleAroundHandlerAsync(
|
|
||||||
handler, options, @event, next, cancellationToken);
|
handler, options, @event, next, cancellationToken);
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
await pipeline();
|
await pipeline();
|
||||||
|
|||||||
@ -176,11 +176,8 @@ public class UiTransitionPipeline
|
|||||||
var options = _aroundOptions[handler];
|
var options = _aroundOptions[handler];
|
||||||
var next = pipeline;
|
var next = pipeline;
|
||||||
|
|
||||||
pipeline = async () =>
|
pipeline = async () => await ExecuteSingleAroundHandlerAsync(
|
||||||
{
|
handler, options, @event, next, cancellationToken);
|
||||||
await ExecuteSingleAroundHandlerAsync(
|
|
||||||
handler, options, @event, next, cancellationToken);
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
await pipeline();
|
await pipeline();
|
||||||
|
|||||||
@ -82,7 +82,7 @@ public partial class Timing : Node
|
|||||||
{
|
{
|
||||||
Name = nameof(Timing)
|
Name = nameof(Timing)
|
||||||
};
|
};
|
||||||
tree.Root.WaitUntilReady(() => { tree.Root.AddChild(_instance); });
|
tree.Root.WaitUntilReady(() => tree.Root.AddChild(_instance));
|
||||||
|
|
||||||
return _instance;
|
return _instance;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user