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

Fix CA1846

Browse Source
This commit is contained in:
RoosterDragon
2023-03-12 16:30:42 +00:00
committed by abcdefg30
parent 07fb5e8027
commit 6362bbd176
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@@ -756,6 +756,9 @@ dotnet_diagnostic.CA1844.severity = warning
# Use span-based 'string.Concat'.
dotnet_diagnostic.CA1845.severity = warning
# Prefer AsSpan over Substring.
dotnet_diagnostic.CA1846.severity = warning
# Use string.Contains(char) instead of string.Contains(string) with single characters.
dotnet_diagnostic.CA1847.severity = warning

8
OpenRA.Game/Primitives/Color.cs
View File

@@ -168,13 +168,13 @@ namespace OpenRA.Primitives
return false;
byte alpha = 255;
if (!byte.TryParse(value[0..2], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var red)
|| !byte.TryParse(value[2..4], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var green)
|| !byte.TryParse(value[4..6], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var blue))
if (!byte.TryParse(value.AsSpan(0, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var red)
|| !byte.TryParse(value.AsSpan(2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var green)
|| !byte.TryParse(value.AsSpan(4, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var blue))
return false;
if (value.Length == 8
&& !byte.TryParse(value[6..8], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out alpha))
&& !byte.TryParse(value.AsSpan(6, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out alpha))
return false;
color = FromArgb(alpha, red, green, blue);

2
OpenRA.Platforms.Default/Sdl2PlatformWindow.cs
View File

@@ -209,7 +209,7 @@ namespace OpenRA.Platforms.Default
var lines = p.StandardOutput.ReadToEnd().Split('\n');
foreach (var line in lines)
if (line.StartsWith("Xft.dpi") && int.TryParse(line[8..], out var dpi))
if (line.StartsWith("Xft.dpi") && int.TryParse(line.AsSpan(8), out var dpi))
windowScale = dpi / 96f;
}
catch { }