mirror of
https://github.com/ppy/osu.git
synced 2026-05-16 11:43:25 +08:00
18d4ba5874
Most of this is as everywhere else, but there's also interesting code inspection fixes from the InspectCode bump, so I'll talk about that a little. ## [Fix suspicious equality in `Hotkey`](https://github.com/ppy/osu/commit/948136e49e88a721827d54e51c5759fe9aca811d) Inspection: https://www.jetbrains.com/help/resharper/TypeWithSuspiciousEqualityIsUsedInRecord.Global.html Pretty annoying to fix, nullable array types are a pain. Does look legit though. ## [Fix `StarDifficulty` using inefficient struct equality](https://github.com/ppy/osu/commit/2db775ebb0bb9f18de67677ef84b993465d26545) Inspection: https://www.jetbrains.com/help/resharper/DefaultStructEqualityIsUsed.Global.html This is a dodgy one because there's no real sane way to define equality on `StarDifficulty` now that it has difficulty and performance attributes jammed into it. So I just basically shut the inspection up with a `record` modifier and move on. Unclear where the equality is used precisely. It's from a global inspection. F12 is very unhelpful when trying to track down usages of `Equals()`. We definitely have `Bindable<StarDifficulty>` instances and those do use equality. Maybe more than that. ## [Use `nameof` expressions to reference enum member names](https://github.com/ppy/osu/commit/aa08175c803bc725f3b15a92174dfe6d1b812d91) Inspection: https://www.jetbrains.com/help/resharper/CanSimplifyDictionaryRemovingWithSingleCall.html Pretty quaint. ## [Prefer using concrete values over `default` or `new()`](https://github.com/ppy/osu/commit/b21ee08d7748be10d42268d5c2eb77369026545d) Inspection: https://www.jetbrains.com/help/resharper/PreferConcreteValueOverDefault.html I could see this one going both ways, but I'm kinda sold on this inspection. Explicit is always better. Saves some allocations in the `CancellationToken` cases as well. ## [Explicitly call `.AsEnumerable()` in some realm usages](https://github.com/ppy/osu/commit/c8ce1ecd42b9d8abb8b9e2ab93d471f463e80401) Inspection: https://www.jetbrains.com/help/resharper/PossibleUnintendedQueryableAsEnumerable.html Not fully sold on this one but it's quick and simple so might as well. ## [Simplify dictionary removal with single `.Remove()` call](https://github.com/ppy/osu/commit/5964ceccea900302df726b7a8ecbf6b74eb2e427) Inspection: https://www.jetbrains.com/help/resharper/CanSimplifyDictionaryRemovingWithSingleCall.html Not much to say.
68 lines
3.2 KiB
C#
68 lines
3.2 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using System;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using osu.Framework.Extensions.ObjectExtensions;
|
|
|
|
namespace osu.Game.Extensions
|
|
{
|
|
public static class TaskExtensions
|
|
{
|
|
/// <summary>
|
|
/// Add a continuation to be performed only after the attached task has completed.
|
|
/// </summary>
|
|
/// <param name="task">The previous task to be awaited on.</param>
|
|
/// <param name="action">The action to run.</param>
|
|
/// <param name="cancellationToken">An optional cancellation token. Will only cancel the provided action, not the sequence.</param>
|
|
/// <returns>A task representing the provided action.</returns>
|
|
public static Task ContinueWithSequential(this Task task, Action action, CancellationToken cancellationToken = default) =>
|
|
task.ContinueWithSequential(() => Task.Run(action, cancellationToken), cancellationToken);
|
|
|
|
/// <summary>
|
|
/// Add a continuation to be performed only after the attached task has completed.
|
|
/// </summary>
|
|
/// <param name="task">The previous task to be awaited on.</param>
|
|
/// <param name="continuationFunction">The continuation to run. Generally should be an async function.</param>
|
|
/// <param name="cancellationToken">An optional cancellation token. Will only cancel the provided action, not the sequence.</param>
|
|
/// <returns>A task representing the provided action.</returns>
|
|
public static Task ContinueWithSequential(this Task task, Func<Task> continuationFunction, CancellationToken cancellationToken = default)
|
|
{
|
|
var tcs = new TaskCompletionSource<bool>();
|
|
|
|
task.ContinueWith(_ =>
|
|
{
|
|
// the previous task has finished execution or been cancelled, so we can run the provided continuation.
|
|
|
|
if (cancellationToken.IsCancellationRequested)
|
|
{
|
|
tcs.SetCanceled(cancellationToken);
|
|
}
|
|
else
|
|
{
|
|
continuationFunction().ContinueWith(continuationTask =>
|
|
{
|
|
if (cancellationToken.IsCancellationRequested || continuationTask.IsCanceled)
|
|
{
|
|
tcs.TrySetCanceled();
|
|
}
|
|
else if (continuationTask.IsFaulted)
|
|
{
|
|
tcs.TrySetException(continuationTask.Exception.AsNonNull());
|
|
}
|
|
else
|
|
{
|
|
tcs.TrySetResult(true);
|
|
}
|
|
}, cancellationToken: CancellationToken.None);
|
|
}
|
|
}, cancellationToken: CancellationToken.None);
|
|
|
|
// importantly, we are not returning the continuation itself but rather a task which represents its status in sequential execution order.
|
|
// this will not be cancelled or completed until the previous task has also.
|
|
return tcs.Task;
|
|
}
|
|
}
|
|
}
|