From 10def52ad9383214a12f9ca8548cc0c9e341357b Mon Sep 17 00:00:00 2001 From: RoosterDragon Date: Sun, 19 Feb 2023 11:20:19 +0000 Subject: [PATCH] Fix IDE0033 --- .editorconfig | 3 +++ .../UtilityCommands/ExtractLuaDocsCommand.cs | 16 ++++++++-------- OpenRA.Mods.Common/Widgets/WidgetUtils.cs | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.editorconfig b/.editorconfig index dd5de70044..2b81b39a30 100644 --- a/.editorconfig +++ b/.editorconfig @@ -159,6 +159,9 @@ dotnet_diagnostic.IDE0029.severity = warning # Use coalesce expression (nullable types). dotnet_diagnostic.IDE0030.severity = warning +# Use explicitly provided tuple name. +dotnet_diagnostic.IDE0033.severity = warning + # Simplify 'default' expression dotnet_diagnostic.IDE0034.severity = warning diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractLuaDocsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ExtractLuaDocsCommand.cs index 665ba386f9..b7179a8828 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ExtractLuaDocsCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ExtractLuaDocsCommand.cs @@ -92,7 +92,7 @@ namespace OpenRA.Mods.Common.UtilityCommands var required = ScriptMemberWrapper.RequiredTraitNames(cg); return ScriptMemberWrapper.WrappableMembers(cg).Select(mi => (category, mi, required)); - }).GroupBy(g => g.Item1).OrderBy(g => g.Key); + }).GroupBy(g => g.category).OrderBy(g => g.Key); foreach (var kv in actorCategories) { @@ -102,10 +102,10 @@ namespace OpenRA.Mods.Common.UtilityCommands Console.WriteLine("| Function | Description |"); Console.WriteLine("|---------:|-------------|"); - foreach (var property in kv.OrderBy(p => p.Item2.Name)) + foreach (var property in kv.OrderBy(p => p.mi.Name)) { - var mi = property.Item2; - var required = property.Item3; + var mi = property.mi; + var required = property.required; var hasDesc = mi.HasAttribute(); var hasRequires = required.Length > 0; var isActivity = mi.HasAttribute(); @@ -141,7 +141,7 @@ namespace OpenRA.Mods.Common.UtilityCommands var required = ScriptMemberWrapper.RequiredTraitNames(cg); return ScriptMemberWrapper.WrappableMembers(cg).Select(mi => (category, mi, required)); - }).GroupBy(g => g.Item1).OrderBy(g => g.Key); + }).GroupBy(g => g.category).OrderBy(g => g.Key); foreach (var kv in playerCategories) { @@ -151,10 +151,10 @@ namespace OpenRA.Mods.Common.UtilityCommands Console.WriteLine("| Function | Description |"); Console.WriteLine("|---------:|-------------|"); - foreach (var property in kv.OrderBy(p => p.Item2.Name)) + foreach (var property in kv.OrderBy(p => p.mi.Name)) { - var mi = property.Item2; - var required = property.Item3; + var mi = property.mi; + var required = property.required; var hasDesc = mi.HasAttribute(); var hasRequires = required.Length > 0; var isActivity = mi.HasAttribute(); diff --git a/OpenRA.Mods.Common/Widgets/WidgetUtils.cs b/OpenRA.Mods.Common/Widgets/WidgetUtils.cs index 85895b51c0..c9bcdda992 100644 --- a/OpenRA.Mods.Common/Widgets/WidgetUtils.cs +++ b/OpenRA.Mods.Common/Widgets/WidgetUtils.cs @@ -323,7 +323,7 @@ namespace OpenRA.Mods.Common.Widgets var nameFont = Game.Renderer.Fonts[label.Font]; var name = new CachedTransform<(string Name, WinState WinState, Session.ClientState ClientState), string>(c => { - var suffix = c.WinState == WinState.Undefined ? "" : " (" + c.Item2 + ")"; + var suffix = c.WinState == WinState.Undefined ? "" : " (" + c.WinState + ")"; if (c.ClientState == Session.ClientState.Disconnected) suffix = " (Gone)";