Use string.Contains(char) instead of string.Contains(string)
with single characters
This commit is contained in:
committed by
Matthias Mailänder
parent
3bc28ba6e2
commit
af3362c62f
@@ -150,6 +150,9 @@ dotnet_diagnostic.IDE1006.severity = warning
|
|||||||
# Avoid unnecessary zero-length array allocations.
|
# Avoid unnecessary zero-length array allocations.
|
||||||
dotnet_diagnostic.CA1825.severity = warning
|
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
|
; 4-column tab indentation
|
||||||
[*.yaml]
|
[*.yaml]
|
||||||
indent_style = tab
|
indent_style = tab
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ namespace OpenRA.FileSystem
|
|||||||
{
|
{
|
||||||
// Raw directories are the easiest and one of the most common cases, so try these first
|
// Raw directories are the easiest and one of the most common cases, so try these first
|
||||||
var resolvedPath = Platform.ResolvePath(filename);
|
var resolvedPath = Platform.ResolvePath(filename);
|
||||||
if (!resolvedPath.Contains("|") && Directory.Exists(resolvedPath))
|
if (!resolvedPath.Contains('|') && Directory.Exists(resolvedPath))
|
||||||
return new Folder(resolvedPath);
|
return new Folder(resolvedPath);
|
||||||
|
|
||||||
// Children of another package require special handling
|
// Children of another package require special handling
|
||||||
|
|||||||
@@ -1324,7 +1324,7 @@ namespace OpenRA
|
|||||||
public Stream Open(string filename)
|
public Stream Open(string filename)
|
||||||
{
|
{
|
||||||
// Explicit package paths never refer to a map
|
// 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 Package.GetStream(filename);
|
||||||
|
|
||||||
return modData.DefaultFileSystem.Open(filename);
|
return modData.DefaultFileSystem.Open(filename);
|
||||||
@@ -1339,7 +1339,7 @@ namespace OpenRA
|
|||||||
public bool TryOpen(string filename, out Stream s)
|
public bool TryOpen(string filename, out Stream s)
|
||||||
{
|
{
|
||||||
// Explicit package paths never refer to a map
|
// Explicit package paths never refer to a map
|
||||||
if (!filename.Contains("|"))
|
if (!filename.Contains('|'))
|
||||||
{
|
{
|
||||||
s = Package.GetStream(filename);
|
s = Package.GetStream(filename);
|
||||||
if (s != null)
|
if (s != null)
|
||||||
@@ -1352,7 +1352,7 @@ namespace OpenRA
|
|||||||
public bool Exists(string filename)
|
public bool Exists(string filename)
|
||||||
{
|
{
|
||||||
// Explicit package paths never refer to a map
|
// Explicit package paths never refer to a map
|
||||||
if (!filename.Contains("|") && Package.Contains(filename))
|
if (!filename.Contains('|') && Package.Contains(filename))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return modData.DefaultFileSystem.Exists(filename);
|
return modData.DefaultFileSystem.Exists(filename);
|
||||||
@@ -1361,7 +1361,7 @@ namespace OpenRA
|
|||||||
public bool IsExternalModFile(string filename)
|
public bool IsExternalModFile(string filename)
|
||||||
{
|
{
|
||||||
// Explicit package paths never refer to a map
|
// Explicit package paths never refer to a map
|
||||||
if (filename.Contains("|"))
|
if (filename.Contains('|'))
|
||||||
return modData.DefaultFileSystem.IsExternalModFile(filename);
|
return modData.DefaultFileSystem.IsExternalModFile(filename);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -559,7 +559,7 @@ namespace OpenRA
|
|||||||
Stream IReadOnlyFileSystem.Open(string filename)
|
Stream IReadOnlyFileSystem.Open(string filename)
|
||||||
{
|
{
|
||||||
// Explicit package paths never refer to a map
|
// 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 Package.GetStream(filename);
|
||||||
|
|
||||||
return modData.DefaultFileSystem.Open(filename);
|
return modData.DefaultFileSystem.Open(filename);
|
||||||
@@ -574,7 +574,7 @@ namespace OpenRA
|
|||||||
bool IReadOnlyFileSystem.TryOpen(string filename, out Stream s)
|
bool IReadOnlyFileSystem.TryOpen(string filename, out Stream s)
|
||||||
{
|
{
|
||||||
// Explicit package paths never refer to a map
|
// Explicit package paths never refer to a map
|
||||||
if (!filename.Contains("|"))
|
if (!filename.Contains('|'))
|
||||||
{
|
{
|
||||||
s = Package.GetStream(filename);
|
s = Package.GetStream(filename);
|
||||||
if (s != null)
|
if (s != null)
|
||||||
@@ -587,7 +587,7 @@ namespace OpenRA
|
|||||||
bool IReadOnlyFileSystem.Exists(string filename)
|
bool IReadOnlyFileSystem.Exists(string filename)
|
||||||
{
|
{
|
||||||
// Explicit package paths never refer to a map
|
// Explicit package paths never refer to a map
|
||||||
if (!filename.Contains("|") && Package.Contains(filename))
|
if (!filename.Contains('|') && Package.Contains(filename))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return modData.DefaultFileSystem.Exists(filename);
|
return modData.DefaultFileSystem.Exists(filename);
|
||||||
@@ -596,7 +596,7 @@ namespace OpenRA
|
|||||||
bool IReadOnlyFileSystem.IsExternalModFile(string filename)
|
bool IReadOnlyFileSystem.IsExternalModFile(string filename)
|
||||||
{
|
{
|
||||||
// Explicit package paths never refer to a map
|
// Explicit package paths never refer to a map
|
||||||
if (filename.Contains("|"))
|
if (filename.Contains('|'))
|
||||||
return modData.DefaultFileSystem.IsExternalModFile(filename);
|
return modData.DefaultFileSystem.IsExternalModFile(filename);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ namespace OpenRA
|
|||||||
|
|
||||||
parent?.AddChild(widget);
|
parent?.AddChild(widget);
|
||||||
|
|
||||||
if (node.Key.Contains("@"))
|
if (node.Key.Contains('@'))
|
||||||
FieldLoader.LoadField(widget, "Id", node.Key.Split('@')[1]);
|
FieldLoader.LoadField(widget, "Id", node.Key.Split('@')[1]);
|
||||||
|
|
||||||
foreach (var child in node.Value.Nodes)
|
foreach (var child in node.Value.Nodes)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.UpdateRules
|
|||||||
static YamlFileSet LoadExternalMapYaml(ModData modData, MiniYaml yaml, HashSet<string> externalFilenames)
|
static YamlFileSet LoadExternalMapYaml(ModData modData, MiniYaml yaml, HashSet<string> externalFilenames)
|
||||||
{
|
{
|
||||||
return FieldLoader.GetValue<string[]>("value", yaml.Value)
|
return FieldLoader.GetValue<string[]>("value", yaml.Value)
|
||||||
.Where(f => f.Contains("|"))
|
.Where(f => f.Contains('|'))
|
||||||
.SelectMany(f => LoadModYaml(modData, FilterExternalModFiles(modData, new[] { f }, externalFilenames)))
|
.SelectMany(f => LoadModYaml(modData, FilterExternalModFiles(modData, new[] { f }, externalFilenames)))
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.UpdateRules
|
|||||||
foreach (var filename in files)
|
foreach (var filename in files)
|
||||||
{
|
{
|
||||||
// Ignore any files that aren't in the map bundle
|
// 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)));
|
fileSet.Add((mapPackage, filename, MiniYaml.FromStream(mapPackage.GetStream(filename), filename, false)));
|
||||||
else if (modData.ModFiles.Exists(filename))
|
else if (modData.ModFiles.Exists(filename))
|
||||||
externalFilenames.Add(filename);
|
externalFilenames.Add(filename);
|
||||||
@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.UpdateRules
|
|||||||
{
|
{
|
||||||
foreach (var f in files)
|
foreach (var f in files)
|
||||||
{
|
{
|
||||||
if (f.Contains("|") && modData.DefaultFileSystem.IsExternalModFile(f))
|
if (f.Contains('|') && modData.DefaultFileSystem.IsExternalModFile(f))
|
||||||
{
|
{
|
||||||
externalFilenames.Add(f);
|
externalFilenames.Add(f);
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
|
|
||||||
static bool IsExplicitInterfaceProperty(PropertyInfo pi)
|
static bool IsExplicitInterfaceProperty(PropertyInfo pi)
|
||||||
{
|
{
|
||||||
return pi.Name.Contains(".");
|
return pi.Name.Contains('.');
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnViolation(Type implementor, Type interfaceType, MemberInfo violator)
|
void OnViolation(Type implementor, Type interfaceType, MemberInfo violator)
|
||||||
|
|||||||
Reference in New Issue
Block a user