diff --git a/OpenRA.Game/Scripting/ScriptMemberWrapper.cs b/OpenRA.Game/Scripting/ScriptMemberWrapper.cs index bd8e1e32f8..1c4a86ef5d 100644 --- a/OpenRA.Game/Scripting/ScriptMemberWrapper.cs +++ b/OpenRA.Game/Scripting/ScriptMemberWrapper.cs @@ -149,7 +149,7 @@ namespace OpenRA.Scripting // Remove the namespace and the trailing "Info" return types.SelectMany(i => i.GetGenericArguments()) - .Select(g => g.Name.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault()) + .Select(g => g.Name.Split('.', StringSplitOptions.RemoveEmptyEntries).LastOrDefault()) .Select(s => s.EndsWith("Info", StringComparison.Ordinal) ? s.Remove(s.Length - 4, 4) : s) .ToArray(); } diff --git a/OpenRA.Mods.Cnc/Traits/World/VoxelCache.cs b/OpenRA.Mods.Cnc/Traits/World/VoxelCache.cs index b132678892..2e07e7e26e 100644 --- a/OpenRA.Mods.Cnc/Traits/World/VoxelCache.cs +++ b/OpenRA.Mods.Cnc/Traits/World/VoxelCache.cs @@ -64,7 +64,7 @@ namespace OpenRA.Mods.Cnc.Traits var hva = unit; if (info.Value != null) { - var fields = info.Value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + var fields = info.Value.Split(',', StringSplitOptions.RemoveEmptyEntries); if (fields.Length >= 1) vxl = hva = fields[0].Trim(); diff --git a/OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs b/OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs index c9c21079d4..30263b408f 100644 --- a/OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs +++ b/OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs @@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.UtilityCommands { string IUtilityCommand.Name => "--rgba2hex"; - static readonly char[] Comma = new char[] { ',' }; + const char Comma = ','; bool IUtilityCommand.ValidateArguments(string[] args) { @@ -105,7 +105,7 @@ namespace OpenRA.Mods.Common.UtilityCommands { string IUtilityCommand.Name => "--argb2hex"; - static readonly char[] Comma = new char[] { ',' }; + const char Comma = ','; bool IUtilityCommand.ValidateArguments(string[] args) { diff --git a/OpenRA.Mods.Common/Widgets/LabelWithHighlightWidget.cs b/OpenRA.Mods.Common/Widgets/LabelWithHighlightWidget.cs index 9914c85185..8c07afb34b 100644 --- a/OpenRA.Mods.Common/Widgets/LabelWithHighlightWidget.cs +++ b/OpenRA.Mods.Common/Widgets/LabelWithHighlightWidget.cs @@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Widgets (string, bool)[] MakeComponents(string text) { var components = new List<(string, bool)>(); - foreach (var l in text.Split(new[] { "\\n" }, StringSplitOptions.None)) + foreach (var l in text.Split("\\n", StringSplitOptions.None)) { var line = l; diff --git a/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs index 65933d696c..d554f605ad 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ButtonTooltipLogic.cs @@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic var descFont = Game.Renderer.Fonts[descTemplate.Font]; var descWidth = 0; var descOffset = descTemplate.Bounds.Y; - foreach (var line in desc.Split(new[] { "\n" }, StringSplitOptions.None)) + foreach (var line in desc.Split('\n', StringSplitOptions.None)) { descWidth = Math.Max(descWidth, descFont.Measure(line).X); var lineLabel = (LabelWidget)descTemplate.Clone(); diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackageLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackageLogic.cs index 7f5166e791..c3432cae10 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackageLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackageLogic.cs @@ -304,7 +304,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic var httpResponseMessage = await client.GetAsync(download.MirrorList); var result = await httpResponseMessage.Content.ReadAsStringAsync(); - var mirrorList = result.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); + var mirrorList = result.Split('\n', StringSplitOptions.RemoveEmptyEntries); DownloadUrl(mirrorList.Random(new MersenneTwister())); } catch (Exception e)