From 6e28a4dd13df0ab866e6a178086abe36ca4a2b25 Mon Sep 17 00:00:00 2001 From: TSRBerry <20988865+TSRBerry@users.noreply.github.com> Date: Thu, 29 Jun 2023 02:39:22 +0200 Subject: [Ryujinx.Ui.Common] Address dotnet-format issues (#5392) * dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Silence dotnet format IDE0060 warnings * Address dotnet format CA1401 warnings * dotnet-format fixes after rebase * 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 * Another rebase, another dotnet format run * Run dotnet format style after rebase * Add comments to disabled warnings * Remove a few unused parameters * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Address IDE0251 warnings * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * Small optimizations * Remove alignment * Apply formatting * Fix build issues * Final pass for dotnet format * Add trailing commas Co-authored-by: Ac_K * Add trailing commas --------- Co-authored-by: Ac_K --- src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs | 22 ++++++++++++++++------ .../Models/Amiibo/AmiiboApiGamesSwitch.cs | 2 +- .../Models/Amiibo/AmiiboApiUsage.cs | 2 +- src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs | 2 +- .../Models/Amiibo/AmiiboJsonSerializerContext.cs | 2 +- .../Github/GithubReleaseAssetJsonResponse.cs | 2 +- .../Models/Github/GithubReleasesJsonResponse.cs | 2 +- .../Github/GithubReleasesJsonSerializerContext.cs | 2 +- 8 files changed, 23 insertions(+), 13 deletions(-) (limited to 'src/Ryujinx.Ui.Common/Models') diff --git a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs index f412b950..e8eba6d3 100644 --- a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs +++ b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs @@ -29,29 +29,39 @@ namespace Ryujinx.Ui.Common.Models.Amiibo [JsonPropertyName("gamesSwitch")] public List GamesSwitch { get; set; } - public override string ToString() + public readonly override string ToString() { return Name; } - public string GetId() + public readonly string GetId() { return Head + Tail; } - public bool Equals(AmiiboApi other) + public readonly bool Equals(AmiiboApi other) { return Head + Tail == other.Head + other.Tail; } - public override bool Equals(object obj) + public readonly override bool Equals(object obj) { return obj is AmiiboApi other && Equals(other); } - public override int GetHashCode() + public readonly override int GetHashCode() { return HashCode.Combine(Head, Tail); } + + public static bool operator ==(AmiiboApi left, AmiiboApi right) + { + return left.Equals(right); + } + + public static bool operator !=(AmiiboApi left, AmiiboApi right) + { + return !(left == right); + } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiGamesSwitch.cs b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiGamesSwitch.cs index def7d1bc..6a0442f0 100644 --- a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiGamesSwitch.cs +++ b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiGamesSwitch.cs @@ -12,4 +12,4 @@ namespace Ryujinx.Ui.Common.Models.Amiibo [JsonPropertyName("gameName")] public string GameName { get; set; } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiUsage.cs b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiUsage.cs index 814573c2..d9d3a18f 100644 --- a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiUsage.cs +++ b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiUsage.cs @@ -9,4 +9,4 @@ namespace Ryujinx.Ui.Common.Models.Amiibo [JsonPropertyName("write")] public bool Write { get; set; } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs index feb7993c..bcfe230d 100644 --- a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs +++ b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs @@ -11,4 +11,4 @@ namespace Ryujinx.Ui.Common.Models.Amiibo [JsonPropertyName("lastUpdated")] public DateTime LastUpdated { get; set; } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJsonSerializerContext.cs b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJsonSerializerContext.cs index 4cbb5a7b..09888d37 100644 --- a/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJsonSerializerContext.cs +++ b/src/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJsonSerializerContext.cs @@ -6,4 +6,4 @@ namespace Ryujinx.Ui.Common.Models.Amiibo public partial class AmiiboJsonSerializerContext : JsonSerializerContext { } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Ui.Common/Models/Github/GithubReleaseAssetJsonResponse.cs b/src/Ryujinx.Ui.Common/Models/Github/GithubReleaseAssetJsonResponse.cs index 10d01478..ed0a49f6 100644 --- a/src/Ryujinx.Ui.Common/Models/Github/GithubReleaseAssetJsonResponse.cs +++ b/src/Ryujinx.Ui.Common/Models/Github/GithubReleaseAssetJsonResponse.cs @@ -6,4 +6,4 @@ public string State { get; set; } public string BrowserDownloadUrl { get; set; } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonResponse.cs b/src/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonResponse.cs index 954d03e3..3fa7cf81 100644 --- a/src/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonResponse.cs +++ b/src/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonResponse.cs @@ -7,4 +7,4 @@ namespace Ryujinx.Ui.Common.Models.Github public string Name { get; set; } public List Assets { get; set; } } -} \ No newline at end of file +} diff --git a/src/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonSerializerContext.cs b/src/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonSerializerContext.cs index e5fd9d09..c6dd8875 100644 --- a/src/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonSerializerContext.cs +++ b/src/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonSerializerContext.cs @@ -6,4 +6,4 @@ namespace Ryujinx.Ui.Common.Models.Github public partial class GithubReleasesJsonSerializerContext : JsonSerializerContext { } -} \ No newline at end of file +} -- cgit v1.2.3