From 46b7c905f5dbb8c7e527281e22d5d2fc36bc666f Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Wed, 28 Jun 2023 18:23:00 +0200
Subject: [Ryujinx.Input] Address dotnet-format issues (#5384)
* dotnet format style --severity info
Some changes were manually reverted.
* dotnet format analyzers --serverity info
Some changes have been minimally adapted.
* Restore a few unused methods and variables
* Address dotnet format CA1816 warnings
* Address or silence dotnet format CA1806 and a few CA1854 warnings
* Address most dotnet format whitespace warnings
* Apply dotnet format whitespace formatting
A few of them have been manually reverted and the corresponding warning was silenced
* Add comments to disabled warnings
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"
This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.
* dotnet format whitespace after rebase
* Remove redundant code, convert to auto-properties and fix naming rule violations
* Remove bogus change
* Address review feedback
---
src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
(limited to 'src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs')
diff --git a/src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs b/src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
index 8621b3a5..388ebcc0 100644
--- a/src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
+++ b/src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
@@ -10,15 +10,15 @@ namespace Ryujinx.Input.Assigner
/// </summary>
public class GamepadButtonAssigner : IButtonAssigner
{
- private IGamepad _gamepad;
+ private readonly IGamepad _gamepad;
private GamepadStateSnapshot _currState;
private GamepadStateSnapshot _prevState;
- private JoystickButtonDetector _detector;
+ private readonly JoystickButtonDetector _detector;
- private bool _forStick;
+ private readonly bool _forStick;
public GamepadButtonAssigner(IGamepad gamepad, float triggerThreshold, bool forStick)
{
@@ -35,7 +35,7 @@ namespace Ryujinx.Input.Assigner
{
_currState = _gamepad.GetStateSnapshot();
_prevState = _currState;
- }
+ }
}
public void ReadInput()
@@ -116,7 +116,7 @@ namespace Ryujinx.Input.Assigner
private class JoystickButtonDetector
{
- private Dictionary<GamepadButtonInputId, InputSummary> _stats;
+ private readonly Dictionary<GamepadButtonInputId, InputSummary> _stats;
public JoystickButtonDetector()
{
@@ -135,9 +135,8 @@ namespace Ryujinx.Input.Assigner
public void AddInput(GamepadButtonInputId button, float value)
{
- InputSummary inputSummary;
- if (!_stats.TryGetValue(button, out inputSummary))
+ if (!_stats.TryGetValue(button, out InputSummary inputSummary))
{
inputSummary = new InputSummary();
_stats.Add(button, inputSummary);
@@ -148,7 +147,7 @@ namespace Ryujinx.Input.Assigner
public override string ToString()
{
- StringWriter writer = new StringWriter();
+ StringWriter writer = new();
foreach (var kvp in _stats)
{
--
cgit v1.2.3-70-g09d2