epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix IDE0074

Browse Source
This commit is contained in:
RoosterDragon
2023-04-05 19:20:51 +01:00
committed by Pavel Penev
parent cbd0583289
commit bd2b3d9793
30 changed files with 42 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@@ -137,7 +137,7 @@ dotnet_diagnostic.IDE0050.severity = silent
# IDE0054/IDE0074 Use compound assignment/Use coalesce compound assignment
#dotnet_style_prefer_compound_assignment = true
dotnet_diagnostic.IDE0054.severity = warning
dotnet_diagnostic.IDE0074.severity = silent # Requires C# 8 - TODO Consider enabling
dotnet_diagnostic.IDE0074.severity = warning
# IDE0056 Use index operator
#csharp_style_prefer_index_operator = true

3
OpenRA.Game/Actor.cs
View File

@@ -600,8 +600,7 @@ namespace OpenRA
Lazy<ScriptActorInterface> luaInterface;
public void OnScriptBind(ScriptContext context)
{
if (luaInterface == null)
luaInterface = Exts.Lazy(() => new ScriptActorInterface(context, this));
luaInterface ??= Exts.Lazy(() => new ScriptActorInterface(context, this));
}
public LuaValue this[LuaRuntime runtime, LuaValue keyValue]

3
OpenRA.Game/FieldLoader.cs
View File

@@ -535,8 +535,7 @@ namespace OpenRA
{
object val;
if (md == null)
md = my.ToDictionary();
md ??= my.ToDictionary();
if (fli.Loader != null)
{
if (!fli.Attribute.Required || md.ContainsKey(fli.YamlName))

3
OpenRA.Game/Graphics/ModelRenderer.cs
View File

@@ -167,8 +167,7 @@ namespace OpenRA.Graphics
CalculateSpriteGeometry(tl, br, 1, out var spriteSize, out var spriteOffset);
CalculateSpriteGeometry(stl, sbr, 2, out var shadowSpriteSize, out var shadowSpriteOffset);
if (sheetBuilderForFrame == null)
sheetBuilderForFrame = new SheetBuilder(SheetType.BGRA, AllocateSheet);
sheetBuilderForFrame ??= new SheetBuilder(SheetType.BGRA, AllocateSheet);
var sprite = sheetBuilderForFrame.Allocate(spriteSize, 0, spriteOffset);
var shadowSprite = sheetBuilderForFrame.Allocate(shadowSpriteSize, 0, shadowSpriteOffset);

3
OpenRA.Game/MiniYaml.cs
View File

@@ -151,8 +151,7 @@ namespace OpenRA
static List<MiniYamlNode> FromLines(IEnumerable<ReadOnlyMemory<char>> lines, string filename, bool discardCommentsAndWhitespace, Dictionary<string, string> stringPool)
{
if (stringPool == null)
stringPool = new Dictionary<string, string>();
stringPool ??= new Dictionary<string, string>();
var levels = new List<List<MiniYamlNode>>
{

3
OpenRA.Game/Player.cs
View File

@@ -294,8 +294,7 @@ namespace OpenRA
Lazy<ScriptPlayerInterface> luaInterface;
public void OnScriptBind(ScriptContext context)
{
if (luaInterface == null)
luaInterface = Exts.Lazy(() => new ScriptPlayerInterface(context, this));
luaInterface ??= Exts.Lazy(() => new ScriptPlayerInterface(context, this));
}
public LuaValue this[LuaRuntime runtime, LuaValue keyValue]

3
OpenRA.Game/Support/PerfTimer.cs
View File

@@ -55,8 +55,7 @@ namespace OpenRA.Support
Write();
else if (ElapsedMs > thresholdMs)
{
if (parent.children == null)
parent.children = new List<PerfTimer>();
parent.children ??= new List<PerfTimer>();
parent.children.Add(this);
}
}

3
OpenRA.Mods.Cnc/Activities/LayMines.cs
View File

@@ -45,8 +45,7 @@ namespace OpenRA.Mods.Cnc.Activities
protected override void OnFirstRun(Actor self)
{
if (minefield == null)
minefield = new List<CPos> { self.Location };
minefield ??= new List<CPos> { self.Location };
}
CPos? NextValidCell(Actor self)

3
OpenRA.Mods.Cnc/SpriteLoaders/ShpRemasteredLoader.cs
View File

@@ -71,8 +71,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
continue;
var prefix = match.Groups["prefix"].Value;
if (framePrefix == null)
framePrefix = prefix;
framePrefix ??= prefix;
if (prefix != framePrefix)
throw new InvalidDataException($"Frame prefix mismatch: `{prefix}` != `{framePrefix}`");

2
OpenRA.Mods.Common/AudioLoaders/OggLoader.cs
View File

@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Common.AudioLoaders
count -= count % format.reader.Channels;
// Get the buffer, creating a new one if none exists or the existing one is too small.
var floatBuffer = conversionBuffer ?? (conversionBuffer = new float[count]);
var floatBuffer = conversionBuffer ??= new float[count];
if (floatBuffer.Length < count)
floatBuffer = conversionBuffer = new float[count];

3
OpenRA.Mods.Common/LoadScreens/SheetLoadScreen.cs
View File

@@ -41,8 +41,7 @@ namespace OpenRA.Mods.Common.LoadScreens
return;
// Start the timer on the first render
if (lastUpdate == null)
lastUpdate = Stopwatch.StartNew();
lastUpdate ??= Stopwatch.StartNew();
// Check for window DPI changes
// We can't trust notifications to be working during initialization, so must do this manually

6
OpenRA.Mods.Common/Pathfinder/HierarchicalPathFinder.cs
View File

@@ -802,8 +802,7 @@ namespace OpenRA.Mods.Common.Pathfinder
sourcesWithPathableNodes.Add(source);
else
{
if (unpathableNodes == null)
unpathableNodes = new List<CPos>();
unpathableNodes ??= new List<CPos>();
unpathableNodes.Add(adjacentSource);
}
}
@@ -814,8 +813,7 @@ namespace OpenRA.Mods.Common.Pathfinder
sourcesWithPathableNodes.Add(source);
else
{
if (unpathableNodes == null)
unpathableNodes = new List<CPos>();
unpathableNodes ??= new List<CPos>();
unpathableNodes.Add(adjacentSource);
}
}

6
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -453,8 +453,7 @@ namespace OpenRA.Mods.Common.Traits
// If all are out of ammo, just use valid armament with highest range
armaments = armaments.OrderByDescending(x => x.MaxRange());
var a = armaments.FirstOrDefault(x => !x.IsTraitPaused);
if (a == null)
a = armaments.First();
a ??= armaments.First();
var outOfRange = !target.IsInRange(self.CenterPosition, a.MaxRange()) ||
(!forceAttack && target.Type == TargetType.FrozenActor && !ab.Info.TargetFrozenActors);
@@ -491,8 +490,7 @@ namespace OpenRA.Mods.Common.Traits
// If all are out of ammo, just use valid armament with highest range
armaments = armaments.OrderByDescending(x => x.MaxRange());
var a = armaments.FirstOrDefault(x => !x.IsTraitPaused);
if (a == null)
a = armaments.First();
a ??= armaments.First();
cursor = !target.IsInRange(self.CenterPosition, a.MaxRange())
? ab.Info.OutsideRangeCursor ?? a.Info.OutsideRangeCursor

12
OpenRA.Mods.Common/Traits/BotModules/SquadManagerBotModule.cs
View File

@@ -272,16 +272,14 @@ namespace OpenRA.Mods.Common.Traits
if (Info.AirUnitsTypes.Contains(a.Info.Name))
{
var air = GetSquadOfType(SquadType.Air);
if (air == null)
air = RegisterNewSquad(bot, SquadType.Air);
air ??= RegisterNewSquad(bot, SquadType.Air);
air.Units.Add(a);
}
else if (Info.NavalUnitsTypes.Contains(a.Info.Name))
{
var ships = GetSquadOfType(SquadType.Naval);
if (ships == null)
ships = RegisterNewSquad(bot, SquadType.Naval);
ships ??= RegisterNewSquad(bot, SquadType.Naval);
ships.Units.Add(a);
}
@@ -336,8 +334,7 @@ namespace OpenRA.Mods.Common.Traits
{
var target = enemies.Count > 0 ? enemies.Random(World.LocalRandom) : b;
var rush = GetSquadOfType(SquadType.Rush);
if (rush == null)
rush = RegisterNewSquad(bot, SquadType.Rush, target);
rush ??= RegisterNewSquad(bot, SquadType.Rush, target);
foreach (var a3 in ownUnits)
rush.Units.Add(a3);
@@ -350,8 +347,7 @@ namespace OpenRA.Mods.Common.Traits
void ProtectOwn(IBot bot, Actor attacker)
{
var protectSq = GetSquadOfType(SquadType.Protection);
if (protectSq == null)
protectSq = RegisterNewSquad(bot, SquadType.Protection, attacker);
protectSq ??= RegisterNewSquad(bot, SquadType.Protection, attacker);
if (!protectSq.IsTargetValid)
protectSq.TargetActor = attacker;

3
OpenRA.Mods.Common/Traits/Buildings/BuildingUtils.cs
View File

@@ -45,8 +45,7 @@ namespace OpenRA.Mods.Common.Traits
if (r.IsTraitDisabled)
continue;
if (acceptedReplacements == null)
acceptedReplacements = new HashSet<string>();
acceptedReplacements ??= new HashSet<string>();
acceptedReplacements.UnionWith(r.Info.Types);
}

3
OpenRA.Mods.Common/Traits/Buildings/LineBuild.cs
View File

@@ -84,8 +84,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyLineBuildSegmentsChanged.SegmentAdded(Actor self, Actor segment)
{
if (segments == null)
segments = new HashSet<Actor>();
segments ??= new HashSet<Actor>();
segments.Add(segment);
}

6
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -120,8 +120,7 @@ namespace OpenRA.Mods.Common.Traits
public bool CanEnterCell(World world, Actor self, CPos cell, SubCell subCell = SubCell.FullCell, Actor ignoreActor = null, BlockedByActor check = BlockedByActor.All)
{
// PERF: Avoid repeated trait queries on the hot path
if (locomotor == null)
locomotor = world.WorldActor.TraitsImplementing<Locomotor>()
locomotor ??= world.WorldActor.TraitsImplementing<Locomotor>()
.SingleOrDefault(l => l.Info.Name == Locomotor);
return locomotor.MovementCostToEnterCell(
@@ -131,8 +130,7 @@ namespace OpenRA.Mods.Common.Traits
public bool CanStayInCell(World world, CPos cell)
{
// PERF: Avoid repeated trait queries on the hot path
if (locomotor == null)
locomotor = world.WorldActor.TraitsImplementing<Locomotor>()
locomotor ??= world.WorldActor.TraitsImplementing<Locomotor>()
.SingleOrDefault(l => l.Info.Name == Locomotor);
if (cell.Layer == CustomMovementLayerType.Tunnel)

3
OpenRA.Mods.Common/Traits/Player/ConquestVictoryConditions.cs
View File

@@ -57,8 +57,7 @@ namespace OpenRA.Mods.Common.Traits
mo.MarkFailed(self.Owner, objectiveID);
// Players, NonCombatants, and IsAlliedWith are all fixed once the game starts, so we can cache the result.
if (otherPlayers == null)
otherPlayers = self.World.Players.Where(p => !p.NonCombatant && !p.IsAlliedWith(self.Owner)).ToArray();
otherPlayers ??= self.World.Players.Where(p => !p.NonCombatant && !p.IsAlliedWith(self.Owner)).ToArray();
if (otherPlayers.Length == 0) return;

12
OpenRA.Mods.Common/Traits/Render/ProductionBar.cs
View File

@@ -29,9 +29,8 @@ namespace OpenRA.Mods.Common.Traits.Render
// Per-actor queue
var queue = ai.TraitInfos<ProductionQueueInfo>().FirstOrDefault(q => ProductionType == q.Type);
// No queues available - check for classic production queues
if (queue == null)
queue = rules.Actors[SystemActors.Player].TraitInfos<ProductionQueueInfo>().FirstOrDefault(q => ProductionType == q.Type);
// If no queues available - check for classic production queues
queue ??= rules.Actors[SystemActors.Player].TraitInfos<ProductionQueueInfo>().FirstOrDefault(q => ProductionType == q.Type);
if (queue == null)
throw new YamlException($"Can't find a queue with ProductionType '{ProductionType}'");
@@ -67,13 +66,10 @@ namespace OpenRA.Mods.Common.Traits.Render
queue = self.TraitsImplementing<ProductionQueue>()
.FirstOrDefault(q => Info.ProductionType == q.Info.Type);
if (queue == null)
{
// No queues available - check for classic production queues
queue = self.Owner.PlayerActor.TraitsImplementing<ProductionQueue>()
// If no queues available - check for classic production queues
queue ??= self.Owner.PlayerActor.TraitsImplementing<ProductionQueue>()
.FirstOrDefault(q => Info.ProductionType == q.Info.Type);
}
}
void ITick.Tick(Actor self)
{

3
OpenRA.Mods.Common/Traits/Render/SelectionDecorationsBase.cs
View File

@@ -101,8 +101,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (selected && self.World.LocalPlayer != null)
{
if (developerMode == null)
developerMode = self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>();
developerMode ??= self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>();
if (developerMode.PathDebug)
yield return new TargetLineRenderable(ActivityTargetPath(self), Color.Green, 1, 2);

3
OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
View File

@@ -307,8 +307,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
var worldNode = Map.RuleDefinitions.Nodes.FirstOrDefault(n => n.Key == "World");
if (worldNode == null)
worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
worldNode ??= new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
if (scorches.Count > 0)
{

6
OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs
View File

@@ -56,14 +56,12 @@ namespace OpenRA.Mods.Common.Widgets
var isDisabled = IsDisabled();
var isHover = Ui.MouseOverWidget == this || Children.Any(c => c == Ui.MouseOverWidget);
if (getMarkerImage == null)
getMarkerImage = WidgetUtils.GetCachedStatefulImage(Decorations, DecorationMarker);
getMarkerImage ??= WidgetUtils.GetCachedStatefulImage(Decorations, DecorationMarker);
var arrowImage = getMarkerImage.Update((isDisabled, Depressed, isHover, false, IsHighlighted()));
WidgetUtils.DrawSprite(arrowImage, stateOffset + new float2(rb.Right - (int)((rb.Height + arrowImage.Size.X) / 2), rb.Top + (int)((rb.Height - arrowImage.Size.Y) / 2)));
if (getSeparatorImage == null)
getSeparatorImage = WidgetUtils.GetCachedStatefulImage(Separators, SeparatorImage);
getSeparatorImage ??= WidgetUtils.GetCachedStatefulImage(Separators, SeparatorImage);
var separatorImage = getSeparatorImage.Update((isDisabled, Depressed, isHover, false, IsHighlighted()));
if (separatorImage != null)

6
OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
View File

@@ -147,13 +147,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (map.Package != null)
{
selectedDirectory = writableDirectories.FirstOrDefault(k => k.Folder.Contains(map.Package.Name));
if (selectedDirectory == null)
selectedDirectory = writableDirectories.FirstOrDefault(k => Directory.GetDirectories(k.Folder.Name).Any(f => f.Contains(map.Package.Name)));
selectedDirectory ??= writableDirectories.FirstOrDefault(k => Directory.GetDirectories(k.Folder.Name).Any(f => f.Contains(map.Package.Name)));
}
// Prioritize MapClassification.User directories over system directories
if (selectedDirectory == null)
selectedDirectory = writableDirectories.OrderByDescending(kv => kv.Classification).First();
selectedDirectory ??= writableDirectories.OrderByDescending(kv => kv.Classification).First();
directoryDropdown.GetText = () => selectedDirectory?.DisplayName ?? "";
directoryDropdown.OnClick = () =>

3
OpenRA.Mods.Common/Widgets/Logic/Ingame/Hotkeys/CycleBasesHotkeyLogic.cs
View File

@@ -65,8 +65,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic.Ingame
.Skip(1)
.FirstOrDefault();
if (next == null)
next = bases.First();
next ??= bases.First();
selection.Combine(world, new Actor[] { next }, false, true);
viewport.Center(selection.Actors);

3
OpenRA.Mods.Common/Widgets/Logic/Ingame/Hotkeys/CycleHarvestersHotkeyLogic.cs
View File

@@ -51,8 +51,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic.Ingame
.Skip(1)
.FirstOrDefault();
if (next == null)
next = harvesters.First();
next ??= harvesters.First();
selection.Combine(world, new Actor[] { next }, false, true);
viewport.Center(selection.Actors);

3
OpenRA.Mods.Common/Widgets/Logic/Ingame/Hotkeys/CycleProductionActorsHotkeyLogic.cs
View File

@@ -58,8 +58,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic.Ingame
.Skip(1)
.FirstOrDefault();
if (next == null)
next = facilities.First();
next ??= facilities.First();
Game.Sound.PlayNotification(world.Map.Rules, null, "Sounds", clickSound, null);

3
OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
View File

@@ -292,8 +292,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ orderByDate, m => -m.ModifiedDate.Ticks }
};
if (orderByFunc == null)
orderByFunc = orderByDict[orderByPlayer];
orderByFunc ??= orderByDict[orderByPlayer];
ScrollItemWidget SetupItem(string o, ScrollItemWidget template)
{

3
OpenRA.Mods.Common/Widgets/Logic/ReplayUtils.cs
View File

@@ -45,8 +45,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public static bool PromptConfirmReplayCompatibility(ReplayMetadata replayMeta, ModData modData, Action onCancel = null)
{
if (onCancel == null)
onCancel = DoNothing;
onCancel ??= DoNothing;
if (replayMeta == null)
return IncompatibleReplayDialog(IncompatibleReplayPrompt, null, modData, onCancel);

3
OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs
View File

@@ -194,8 +194,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
if (added.Add(hd))
{
if (selectedHotkeyDefinition == null)
selectedHotkeyDefinition = hd;
selectedHotkeyDefinition ??= hd;
BindHotkeyPref(hd, template);
}

3
OpenRA.Mods.Common/Widgets/Logic/Settings/SettingsLogic.cs
View File

@@ -155,8 +155,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
var panel = panelContainer.Get(panelID);
if (activePanel == null)
activePanel = panelID;
activePanel ??= panelID;
panel.IsVisible = () => activePanel == panelID;