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

Enable Net 7 and Net 8 style rules.

Browse Source
This commit is contained in:
RoosterDragon
2024-11-25 20:15:58 +00:00
committed by Gustas Kažukauskas
parent 71ae0aedfb
commit cfde11556f
31 changed files with 74 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var visOptionTemplate = visibilityPanel.Get<CheckboxWidget>("VISIBILITY_TEMPLATE");
visibilityPanel.RemoveChildren();
foreach (MapVisibility visibilityOption in Enum.GetValues(typeof(MapVisibility)))
foreach (var visibilityOption in Enum.GetValues<MapVisibility>())
{
// To prevent users from breaking the game only show the 'Shellmap' option when it is already set.
if (visibilityOption == MapVisibility.Shellmap && !map.Visibility.HasFlag(visibilityOption))
@@ -311,8 +311,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
try
{
if (package == null)
throw new ArgumentNullException(nameof(package));
ArgumentNullException.ThrowIfNull(package);
map.Save(package);

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -102,7 +102,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.worldRenderer = worldRenderer;
MiniYaml yaml;
var keyNames = Enum.GetNames(typeof(ObserverStatsPanel));
var keyNames = Enum.GetNames<ObserverStatsPanel>();
var statsHotkeys = new HotkeyReference[keyNames.Length];
for (var i = 0; i < keyNames.Length; i++)
statsHotkeys[i] = logicArgs.TryGetValue("Statistics" + keyNames[i] + "Key", out yaml) ? modData.Hotkeys[yaml.Value] : new HotkeyReference();

4
OpenRA.Mods.Common/Widgets/TextFieldWidget.cs
View File

@@ -321,7 +321,7 @@ namespace OpenRA.Mods.Common.Widgets
if (e.Modifiers.HasModifier(Modifiers.Ctrl) && CursorPosition < Text.Length)
{
// Write directly to the Text backing field to avoid unnecessary validation
text = text.Remove(CursorPosition);
text = text[..CursorPosition];
CursorPosition = CursorPosition.Clamp(0, text.Length);
OnTextEdited();
@@ -379,7 +379,7 @@ namespace OpenRA.Mods.Common.Widgets
if ((!isOSX && e.Modifiers.HasModifier(Modifiers.Ctrl)) || (isOSX && e.Modifiers.HasModifier(Modifiers.Alt)))
text = text[..CursorPosition] + text[GetNextWhitespaceIndex()..];
else if (isOSX && e.Modifiers.HasModifier(Modifiers.Meta))
text = text.Remove(CursorPosition);
text = text[..CursorPosition];
else
text = text.Remove(CursorPosition, 1);