mirror of
https://github.com/ppy/osu.git
synced 2026-05-13 19:54:15 +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.
81 lines
2.7 KiB
C#
81 lines
2.7 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.Collections;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using osu.Framework.Input;
|
|
using osu.Framework.Input.Bindings;
|
|
using osu.Framework.Platform;
|
|
using osu.Game.Input;
|
|
using osu.Game.Input.Bindings;
|
|
|
|
namespace osu.Game.Graphics.UserInterface
|
|
{
|
|
public readonly record struct Hotkey
|
|
{
|
|
public KeyCombination[]? KeyCombinations { get; init; }
|
|
public GlobalAction? GlobalAction { get; init; }
|
|
public PlatformAction? PlatformAction { get; init; }
|
|
|
|
public Hotkey(params KeyCombination[] keyCombinations)
|
|
{
|
|
KeyCombinations = keyCombinations;
|
|
}
|
|
|
|
public Hotkey(GlobalAction globalAction)
|
|
{
|
|
GlobalAction = globalAction;
|
|
}
|
|
|
|
public Hotkey(PlatformAction platformAction)
|
|
{
|
|
PlatformAction = platformAction;
|
|
}
|
|
|
|
public IEnumerable<string> ResolveKeyCombination(ReadableKeyCombinationProvider keyCombinationProvider, RealmKeyBindingStore keyBindingStore, GameHost gameHost)
|
|
{
|
|
var result = new List<string>();
|
|
|
|
if (KeyCombinations != null)
|
|
{
|
|
result.AddRange(KeyCombinations.Select(keyCombinationProvider.GetReadableString));
|
|
}
|
|
|
|
if (GlobalAction != null)
|
|
{
|
|
result.AddRange(keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.Value));
|
|
}
|
|
|
|
if (PlatformAction != null)
|
|
{
|
|
var action = PlatformAction.Value;
|
|
var bindings = gameHost.PlatformKeyBindings.Where(kb => (PlatformAction)kb.Action == action);
|
|
result.AddRange(bindings.Select(b => keyCombinationProvider.GetReadableString(b.KeyCombination)));
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
public bool Equals(Hotkey other)
|
|
{
|
|
if (KeyCombinations == null && other.KeyCombinations != null)
|
|
return false;
|
|
|
|
if (KeyCombinations != null && other.KeyCombinations == null)
|
|
return false;
|
|
|
|
bool result = (KeyCombinations == null && other.KeyCombinations == null) || KeyCombinations!.SequenceEqual(other.KeyCombinations!);
|
|
result &= GlobalAction == other.GlobalAction;
|
|
result &= PlatformAction == other.PlatformAction;
|
|
return result;
|
|
}
|
|
|
|
public override int GetHashCode()
|
|
{
|
|
return HashCode.Combine(StructuralComparisons.StructuralEqualityComparer.GetHashCode(KeyCombinations ?? []), GlobalAction, PlatformAction);
|
|
}
|
|
}
|
|
}
|