Fix IDE0033
This commit is contained in:
committed by
Pavel Penev
parent
99c1a4448b
commit
10def52ad9
@@ -159,6 +159,9 @@ dotnet_diagnostic.IDE0029.severity = warning
|
|||||||
# Use coalesce expression (nullable types).
|
# Use coalesce expression (nullable types).
|
||||||
dotnet_diagnostic.IDE0030.severity = warning
|
dotnet_diagnostic.IDE0030.severity = warning
|
||||||
|
|
||||||
|
# Use explicitly provided tuple name.
|
||||||
|
dotnet_diagnostic.IDE0033.severity = warning
|
||||||
|
|
||||||
# Simplify 'default' expression
|
# Simplify 'default' expression
|
||||||
dotnet_diagnostic.IDE0034.severity = warning
|
dotnet_diagnostic.IDE0034.severity = warning
|
||||||
|
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
|
|
||||||
var required = ScriptMemberWrapper.RequiredTraitNames(cg);
|
var required = ScriptMemberWrapper.RequiredTraitNames(cg);
|
||||||
return ScriptMemberWrapper.WrappableMembers(cg).Select(mi => (category, mi, required));
|
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)
|
foreach (var kv in actorCategories)
|
||||||
{
|
{
|
||||||
@@ -102,10 +102,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
Console.WriteLine("| Function | Description |");
|
Console.WriteLine("| Function | Description |");
|
||||||
Console.WriteLine("|---------:|-------------|");
|
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 mi = property.mi;
|
||||||
var required = property.Item3;
|
var required = property.required;
|
||||||
var hasDesc = mi.HasAttribute<DescAttribute>();
|
var hasDesc = mi.HasAttribute<DescAttribute>();
|
||||||
var hasRequires = required.Length > 0;
|
var hasRequires = required.Length > 0;
|
||||||
var isActivity = mi.HasAttribute<ScriptActorPropertyActivityAttribute>();
|
var isActivity = mi.HasAttribute<ScriptActorPropertyActivityAttribute>();
|
||||||
@@ -141,7 +141,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
|
|
||||||
var required = ScriptMemberWrapper.RequiredTraitNames(cg);
|
var required = ScriptMemberWrapper.RequiredTraitNames(cg);
|
||||||
return ScriptMemberWrapper.WrappableMembers(cg).Select(mi => (category, mi, required));
|
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)
|
foreach (var kv in playerCategories)
|
||||||
{
|
{
|
||||||
@@ -151,10 +151,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
Console.WriteLine("| Function | Description |");
|
Console.WriteLine("| Function | Description |");
|
||||||
Console.WriteLine("|---------:|-------------|");
|
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 mi = property.mi;
|
||||||
var required = property.Item3;
|
var required = property.required;
|
||||||
var hasDesc = mi.HasAttribute<DescAttribute>();
|
var hasDesc = mi.HasAttribute<DescAttribute>();
|
||||||
var hasRequires = required.Length > 0;
|
var hasRequires = required.Length > 0;
|
||||||
var isActivity = mi.HasAttribute<ScriptActorPropertyActivityAttribute>();
|
var isActivity = mi.HasAttribute<ScriptActorPropertyActivityAttribute>();
|
||||||
|
|||||||
@@ -323,7 +323,7 @@ namespace OpenRA.Mods.Common.Widgets
|
|||||||
var nameFont = Game.Renderer.Fonts[label.Font];
|
var nameFont = Game.Renderer.Fonts[label.Font];
|
||||||
var name = new CachedTransform<(string Name, WinState WinState, Session.ClientState ClientState), string>(c =>
|
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)
|
if (c.ClientState == Session.ClientState.Disconnected)
|
||||||
suffix = " (Gone)";
|
suffix = " (Gone)";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user