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

Use string.Contains(char) instead of string.Contains(string)

Browse Source 
with single characters
This commit is contained in:
Matthias Mailänder
2022-04-13 16:45:12 +02:00
committed by Matthias Mailänder
parent 3bc28ba6e2
commit af3362c62f
7 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@@ -150,6 +150,9 @@ dotnet_diagnostic.IDE1006.severity = warning
# Avoid unnecessary zero-length array allocations.
dotnet_diagnostic.CA1825.severity = warning
# Use string.Contains(char) instead of string.Contains(string) with single characters.
dotnet_diagnostic.CA1847.severity = warning
; 4-column tab indentation
[*.yaml]
indent_style = tab

2
OpenRA.Game/FileSystem/FileSystem.cs
View File

@@ -63,7 +63,7 @@ namespace OpenRA.FileSystem
{
// Raw directories are the easiest and one of the most common cases, so try these first
var resolvedPath = Platform.ResolvePath(filename);
if (!resolvedPath.Contains("|") && Directory.Exists(resolvedPath))
if (!resolvedPath.Contains('|') && Directory.Exists(resolvedPath))
return new Folder(resolvedPath);
// Children of another package require special handling

8
OpenRA.Game/Map/Map.cs
View File

@@ -1324,7 +1324,7 @@ namespace OpenRA
public Stream Open(string filename)
{
// Explicit package paths never refer to a map
if (!filename.Contains("|") && Package.Contains(filename))
if (!filename.Contains('|') && Package.Contains(filename))
return Package.GetStream(filename);
return modData.DefaultFileSystem.Open(filename);
@@ -1339,7 +1339,7 @@ namespace OpenRA
public bool TryOpen(string filename, out Stream s)
{
// Explicit package paths never refer to a map
if (!filename.Contains("|"))
if (!filename.Contains('|'))
{
s = Package.GetStream(filename);
if (s != null)
@@ -1352,7 +1352,7 @@ namespace OpenRA
public bool Exists(string filename)
{
// Explicit package paths never refer to a map
if (!filename.Contains("|") && Package.Contains(filename))
if (!filename.Contains('|') && Package.Contains(filename))
return true;
return modData.DefaultFileSystem.Exists(filename);
@@ -1361,7 +1361,7 @@ namespace OpenRA
public bool IsExternalModFile(string filename)
{
// Explicit package paths never refer to a map
if (filename.Contains("|"))
if (filename.Contains('|'))
return modData.DefaultFileSystem.IsExternalModFile(filename);
return false;

8
OpenRA.Game/Map/MapPreview.cs
View File

@@ -559,7 +559,7 @@ namespace OpenRA
Stream IReadOnlyFileSystem.Open(string filename)
{
// Explicit package paths never refer to a map
if (!filename.Contains("|") && Package.Contains(filename))
if (!filename.Contains('|') && Package.Contains(filename))
return Package.GetStream(filename);
return modData.DefaultFileSystem.Open(filename);
@@ -574,7 +574,7 @@ namespace OpenRA
bool IReadOnlyFileSystem.TryOpen(string filename, out Stream s)
{
// Explicit package paths never refer to a map
if (!filename.Contains("|"))
if (!filename.Contains('|'))
{
s = Package.GetStream(filename);
if (s != null)
@@ -587,7 +587,7 @@ namespace OpenRA
bool IReadOnlyFileSystem.Exists(string filename)
{
// Explicit package paths never refer to a map
if (!filename.Contains("|") && Package.Contains(filename))
if (!filename.Contains('|') && Package.Contains(filename))
return true;
return modData.DefaultFileSystem.Exists(filename);
@@ -596,7 +596,7 @@ namespace OpenRA
bool IReadOnlyFileSystem.IsExternalModFile(string filename)
{
// Explicit package paths never refer to a map
if (filename.Contains("|"))
if (filename.Contains('|'))
return modData.DefaultFileSystem.IsExternalModFile(filename);
return false;

2
OpenRA.Game/Widgets/WidgetLoader.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA
parent?.AddChild(widget);
if (node.Key.Contains("@"))
if (node.Key.Contains('@'))
FieldLoader.LoadField(widget, "Id", node.Key.Split('@')[1]);
foreach (var child in node.Value.Nodes)

6
OpenRA.Mods.Common/UpdateRules/UpdateUtils.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.UpdateRules
static YamlFileSet LoadExternalMapYaml(ModData modData, MiniYaml yaml, HashSet<string> externalFilenames)
{
return FieldLoader.GetValue<string[]>("value", yaml.Value)
.Where(f => f.Contains("|"))
.Where(f => f.Contains('|'))
.SelectMany(f => LoadModYaml(modData, FilterExternalModFiles(modData, new[] { f }, externalFilenames)))
.ToList();
}
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.UpdateRules
foreach (var filename in files)
{
// Ignore any files that aren't in the map bundle
if (!filename.Contains("|") && mapPackage.Contains(filename))
if (!filename.Contains('|') && mapPackage.Contains(filename))
fileSet.Add((mapPackage, filename, MiniYaml.FromStream(mapPackage.GetStream(filename), filename, false)));
else if (modData.ModFiles.Exists(filename))
externalFilenames.Add(filename);
@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.UpdateRules
{
foreach (var f in files)
{
if (f.Contains("|") && modData.DefaultFileSystem.IsExternalModFile(f))
if (f.Contains('|') && modData.DefaultFileSystem.IsExternalModFile(f))
{
externalFilenames.Add(f);
continue;

2
OpenRA.Mods.Common/UtilityCommands/CheckExplicitInterfacesCommand.cs
View File

@@ -111,7 +111,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
static bool IsExplicitInterfaceProperty(PropertyInfo pi)
{
return pi.Name.Contains(".");
return pi.Name.Contains('.');
}
void OnViolation(Type implementor, Type interfaceType, MemberInfo violator)