Improve some String.Split calls.
This commit is contained in:
committed by
Pavel Penev
parent
cf7f57252e
commit
bf7f81b7fe
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user