From 99c1a4448b55994df558ac59d3d146a8ee74d5c1 Mon Sep 17 00:00:00 2001 From: RoosterDragon Date: Sun, 19 Feb 2023 10:24:48 +0000 Subject: [PATCH] Fix IDE0030 --- .editorconfig | 3 +++ OpenRA.Mods.Common/Scripting/Global/UserInterfaceGlobal.cs | 2 +- OpenRA.Mods.Common/Terrain/DefaultTileCache.cs | 2 +- OpenRA.Mods.Common/Traits/World/SpawnStartingUnits.cs | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 8fcb154361..dd5de70044 100644 --- a/.editorconfig +++ b/.editorconfig @@ -156,6 +156,9 @@ dotnet_diagnostic.IDE0028.severity = warning # Use coalesce expression (non-nullable types). dotnet_diagnostic.IDE0029.severity = warning +# Use coalesce expression (nullable types). +dotnet_diagnostic.IDE0030.severity = warning + # Simplify 'default' expression dotnet_diagnostic.IDE0034.severity = warning diff --git a/OpenRA.Mods.Common/Scripting/Global/UserInterfaceGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/UserInterfaceGlobal.cs index f07d7d3e6b..e9510e2b80 100644 --- a/OpenRA.Mods.Common/Scripting/Global/UserInterfaceGlobal.cs +++ b/OpenRA.Mods.Common/Scripting/Global/UserInterfaceGlobal.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Scripting.Global var luaLabel = Ui.Root.Get("INGAME_ROOT").Get("MISSION_TEXT"); luaLabel.GetText = () => text; - var c = color.HasValue ? color.Value : Color.White; + var c = color ?? Color.White; luaLabel.GetColor = () => c; } diff --git a/OpenRA.Mods.Common/Terrain/DefaultTileCache.cs b/OpenRA.Mods.Common/Terrain/DefaultTileCache.cs index aae4ea049c..1961c483fd 100644 --- a/OpenRA.Mods.Common/Terrain/DefaultTileCache.cs +++ b/OpenRA.Mods.Common/Terrain/DefaultTileCache.cs @@ -172,7 +172,7 @@ namespace OpenRA.Mods.Common.Terrain if (r.Index >= template.Stride) return missingTile; - var start = template.Variants > 1 ? variant.HasValue ? variant.Value : random.Next(template.Variants) : 0; + var start = template.Variants > 1 ? variant ?? random.Next(template.Variants) : 0; return template.Sprites[start * template.Stride + r.Index]; } diff --git a/OpenRA.Mods.Common/Traits/World/SpawnStartingUnits.cs b/OpenRA.Mods.Common/Traits/World/SpawnStartingUnits.cs index cbcddaf271..33eb062dfe 100644 --- a/OpenRA.Mods.Common/Traits/World/SpawnStartingUnits.cs +++ b/OpenRA.Mods.Common/Traits/World/SpawnStartingUnits.cs @@ -87,7 +87,7 @@ namespace OpenRA.Mods.Common.Traits if (unitGroup.BaseActor != null) { - var facing = unitGroup.BaseActorFacing.HasValue ? unitGroup.BaseActorFacing.Value : new WAngle(w.SharedRandom.Next(1024)); + var facing = unitGroup.BaseActorFacing ?? new WAngle(w.SharedRandom.Next(1024)); w.CreateActor(unitGroup.BaseActor.ToLowerInvariant(), new TypeDictionary { new LocationInit(p.HomeLocation + unitGroup.BaseActorOffset), @@ -115,7 +115,7 @@ namespace OpenRA.Mods.Common.Traits } var subCell = ip.SharesCell ? w.ActorMap.FreeSubCell(validCell) : 0; - var facing = unitGroup.SupportActorsFacing.HasValue ? unitGroup.SupportActorsFacing.Value : new WAngle(w.SharedRandom.Next(1024)); + var facing = unitGroup.SupportActorsFacing ?? new WAngle(w.SharedRandom.Next(1024)); w.CreateActor(s.ToLowerInvariant(), new TypeDictionary {