[Ryujinx.HLE] Address dotnet-format issues (#5380)

* 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

* Silence dotnet format IDE0060 warnings

* Silence dotnet format IDE0052 warnings

* Address or silence dotnet format IDE1006 warnings

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA2208 warnings

* Address or silence dotnet format CA1806 and a few CA1854 warnings

* Address dotnet format CA2211 warnings

* Address dotnet format CA1822 warnings

* Address or silence dotnet format CA1069 warnings

* Make dotnet format succeed in style mode

* Address or silence dotnet format CA2211 warnings

* Address review comments

* Address dotnet format CA2208 warnings properly

* Make ProcessResult readonly

* 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 previously silenced warnings back

I have no clue how these disappeared

* Revert formatting changes for while and for-loops

* Format if-blocks correctly

* Run dotnet format style after rebase

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format analyzers after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Disable 'prefer switch expression' rule

* Add comments to disabled warnings

* Fix a few disabled warnings

* Fix naming rule violation, Convert shader properties to auto-property and convert values to const

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Start working on disabled warnings

* Fix and silence a few dotnet-format warnings again

* Run dotnet format after rebase

* Use using declaration instead of block syntax

* Address IDE0251 warnings

* Address a few disabled IDE0060 warnings

* Silence IDE0060 in .editorconfig

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* First dotnet format pass

* Fix naming rule violations

* Fix typo

* Add trailing commas, use targeted new and use array initializer

* Fix build issues

* Fix remaining build issues

* Remove SuppressMessage for CA1069 where possible

* Address dotnet format issues

* Address formatting issues

Co-authored-by: Ac_K <acoustik666@gmail.com>

* Add GetHashCode implementation for RenderingSurfaceInfo

* Explicitly silence CA1822 for every affected method in Syscall

* Address formatting issues in Demangler.cs

* Address review feedback

Co-authored-by: Ac_K <acoustik666@gmail.com>

* Revert marking service methods as static

* Next dotnet format pass

* Address review feedback

---------

Co-authored-by: Ac_K <acoustik666@gmail.com>
This commit is contained in:
TSRBerry
2023-07-16 19:31:14 +02:00
committed by GitHub
parent fec8291c17
commit 326749498b
1015 changed files with 8173 additions and 7615 deletions

View File

@@ -7,6 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer
public static PlayerIndex GetIndexFromNpadIdType(NpadIdType npadIdType)
=> npadIdType switch
{
#pragma warning disable IDE0055 // Disable formatting
NpadIdType.Player1 => PlayerIndex.Player1,
NpadIdType.Player2 => PlayerIndex.Player2,
NpadIdType.Player3 => PlayerIndex.Player3,
@@ -17,12 +18,14 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer
NpadIdType.Player8 => PlayerIndex.Player8,
NpadIdType.Handheld => PlayerIndex.Handheld,
NpadIdType.Unknown => PlayerIndex.Unknown,
_ => throw new ArgumentOutOfRangeException(nameof(npadIdType))
_ => throw new ArgumentOutOfRangeException(nameof(npadIdType)),
#pragma warning restore IDE0055
};
public static NpadIdType GetNpadIdTypeFromIndex(PlayerIndex index)
=> index switch
{
#pragma warning disable IDE0055 // Disable formatting
PlayerIndex.Player1 => NpadIdType.Player1,
PlayerIndex.Player2 => NpadIdType.Player2,
PlayerIndex.Player3 => NpadIdType.Player3,
@@ -33,7 +36,8 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer
PlayerIndex.Player8 => NpadIdType.Player8,
PlayerIndex.Handheld => NpadIdType.Handheld,
PlayerIndex.Unknown => NpadIdType.Unknown,
_ => throw new ArgumentOutOfRangeException(nameof(index))
_ => throw new ArgumentOutOfRangeException(nameof(index)),
#pragma warning restore IDE0055
};
public static bool IsValidNpadIdType(NpadIdType npadIdType)
@@ -43,4 +47,4 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer
npadIdType == NpadIdType.Unknown;
}
}
}
}

View File

@@ -8,9 +8,11 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer
// ActivateVibrationDevice(nn::hid::VibrationDeviceHandle)
public ResultCode ActivateVibrationDevice(ServiceCtx context)
{
#pragma warning disable IDE0059 // Remove unnecessary value assignment
int vibrationDeviceHandle = context.RequestData.ReadInt32();
#pragma warning restore IDE0059
return ResultCode.Success;
}
}
}
}

View File

@@ -7,8 +7,8 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer
{
class IAppletResource : IpcService
{
private KSharedMemory _hidSharedMem;
private int _hidSharedMemHandle;
private readonly KSharedMemory _hidSharedMem;
private int _hidSharedMemHandle;
public IAppletResource(KSharedMemory hidSharedMem)
{
@@ -32,4 +32,4 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer
return ResultCode.Success;
}
}
}
}

View File

@@ -4,6 +4,6 @@
{
Dual,
Single,
None
None,
}
}
}

View File

@@ -3,6 +3,6 @@
public enum NpadJoyDeviceType
{
Left,
Right
Right,
}
}
}

View File

@@ -5,4 +5,4 @@
public float X;
public float Y;
}
}
}

View File

@@ -4,6 +4,6 @@
{
Loose,
Standard,
Tight
Tight,
}
}
}

View File

@@ -5,4 +5,4 @@
public float RevisePower;
public float ReviseRange;
}
}
}

View File

@@ -7,4 +7,4 @@
public byte Position;
public byte Reserved;
}
}
}

View File

@@ -4,6 +4,6 @@
{
None,
Left,
Right
Right,
}
}
}

View File

@@ -4,6 +4,6 @@
{
None,
LinearResonantActuator,
GcErm
GcErm,
}
}
}

View File

@@ -2,7 +2,7 @@
{
public struct VibrationDeviceValue
{
public VibrationDeviceType DeviceType;
public VibrationDeviceType DeviceType;
public VibrationDevicePosition Position;
}
}
}

View File

@@ -9,16 +9,26 @@ namespace Ryujinx.HLE.HOS.Services.Hid
public float AmplitudeHigh;
public float FrequencyHigh;
public override bool Equals(object obj)
public readonly override bool Equals(object obj)
{
return obj is VibrationValue value &&
AmplitudeLow == value.AmplitudeLow &&
AmplitudeHigh == value.AmplitudeHigh;
}
public override int GetHashCode()
public readonly override int GetHashCode()
{
return HashCode.Combine(AmplitudeLow, AmplitudeHigh);
}
public static bool operator ==(VibrationValue left, VibrationValue right)
{
return left.Equals(right);
}
public static bool operator !=(VibrationValue left, VibrationValue right)
{
return !(left == right);
}
}
}
}