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

Fix SA1316

Browse Source
This commit is contained in:
RoosterDragon
2023-04-05 19:38:09 +01:00
committed by Pavel Penev
parent 062dc2bd40
commit a167f9680f
6 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.editorconfig
View File

@@ -599,7 +599,6 @@ dotnet_diagnostic.SA1642.severity = none # ConstructorSummaryDocumentationShould
dotnet_diagnostic.SA1649.severity = none # FileNameMustMatchTypeName dotnet_diagnostic.SA1649.severity = none # FileNameMustMatchTypeName
# Requires C# 8/9 - TODO Consider enabling # Requires C# 8/9 - TODO Consider enabling
dotnet_diagnostic.SA1316.severity = none # TupleElementNamesShouldUseCorrectCasing
dotnet_diagnostic.SA1414.severity = none # TupleTypesInSignaturesShouldHaveElementNames dotnet_diagnostic.SA1414.severity = none # TupleTypesInSignaturesShouldHaveElementNames
#### Code Quality Rules #### Code Quality Rules

2
OpenRA.Game/Map/MapCache.cs
View File

@@ -195,7 +195,7 @@ namespace OpenRA
} }
} }
public IEnumerable<(IReadWritePackage package, string map)> EnumerateMapDirPackagesAndNames(MapClassification classification = MapClassification.System) public IEnumerable<(IReadWritePackage Package, string Map)> EnumerateMapDirPackagesAndNames(MapClassification classification = MapClassification.System)
{ {
var mapDirPackages = EnumerateMapDirPackages(classification); var mapDirPackages = EnumerateMapDirPackages(classification);

10
OpenRA.Mods.Common/Traits/HitShape.cs
View File

@@ -74,11 +74,11 @@ namespace OpenRA.Mods.Common.Traits
ITargetableCells targetableCells; ITargetableCells targetableCells;
Turreted turret; Turreted turret;
((CPos Cell, SubCell SubCell)[] targetableCells, ((CPos Cell, SubCell SubCell)[] TargetableCells,
WPos? selfCenterPosition, WPos? SelfCenterPosition,
WRot? selfOrientation, WRot? SelfOrientation,
WRot? turretLocalOrientation, WRot? TurretLocalOrientation,
WVec? turretOffset) cacheInput; WVec? TurretOffset) cacheInput;
WPos[] cachedTargetablePositions; WPos[] cachedTargetablePositions;

4
OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs
View File

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
ObjectCreator.MissingTypeAction = s => EmitError($"Missing Type: {s}"); ObjectCreator.MissingTypeAction = s => EmitError($"Missing Type: {s}");
FieldLoader.UnknownFieldAction = (s, f) => EmitError($"FieldLoader: Missing field `{s}` on `{f.Name}`"); FieldLoader.UnknownFieldAction = (s, f) => EmitError($"FieldLoader: Missing field `{s}` on `{f.Name}`");
var maps = new List<(IReadWritePackage package, string map)>(); var maps = new List<(IReadWritePackage Package, string Map)>();
if (args.Length < 2) if (args.Length < 2)
{ {
Console.WriteLine($"Testing mod: {modData.Manifest.Metadata.Title}"); Console.WriteLine($"Testing mod: {modData.Manifest.Metadata.Title}");
@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
foreach (var map in maps) foreach (var map in maps)
{ {
var package = map.package.OpenPackage(map.map, modData.ModFiles); var package = map.Package.OpenPackage(map.Map, modData.ModFiles);
if (package == null) if (package == null)
continue; continue;

2
OpenRA.Mods.Common/Widgets/ImageWidget.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Widgets
public Func<string> GetTooltipText; public Func<string> GetTooltipText;
readonly CachedTransform<(string, string), Sprite> getImageCache = new( readonly CachedTransform<(string, string), Sprite> getImageCache = new(
((string collection, string image) args) => ChromeProvider.GetImage(args.collection, args.image)); ((string Collection, string Image) args) => ChromeProvider.GetImage(args.Collection, args.Image));
public ImageWidget() public ImageWidget()
{ {

4
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
View File

@@ -37,11 +37,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
power.GetColor = () => powerManager.ExcessPower < 0 ? Color.Red : Color.White; power.GetColor = () => powerManager.ExcessPower < 0 ? Color.Red : Color.White;
power.GetText = () => developerMode.UnlimitedPower ? unlimitedCapacity : powerManager.ExcessPower.ToString(); power.GetText = () => developerMode.UnlimitedPower ? unlimitedCapacity : powerManager.ExcessPower.ToString();
var tooltipTextCached = new CachedTransform<(string, string), string>(((string usage, string capacity) args) => var tooltipTextCached = new CachedTransform<(string, string), string>(((string Usage, string Capacity) args) =>
{ {
return modData.Translation.GetString( return modData.Translation.GetString(
PowerUsage, PowerUsage,
Translation.Arguments("usage", args.usage, "capacity", args.capacity)); Translation.Arguments("usage", args.Usage, "capacity", args.Capacity));
}); });
power.GetTooltipText = () => power.GetTooltipText = () =>