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

Simplify method name in CheckFluentReferences.

Browse Source
This commit is contained in:
Paul Chote
2024-10-19 14:33:25 +01:00
committed by Gustas
parent c09d7cbdea
commit ecaa414508
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Lint/CheckFluentReferences.cs
View File

@@ -240,7 +240,7 @@ namespace OpenRA.Mods.Common.Lint
// TODO: linter does not work with LoadUsing // TODO: linter does not work with LoadUsing
foreach (var speed in modData.Manifest.Get<GameSpeeds>().Speeds) foreach (var speed in modData.Manifest.Get<GameSpeeds>().Speeds)
GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute( GetUsedFluentKeys(
usedKeys, testedFields, usedKeys, testedFields,
Utility.GetFields(typeof(GameSpeed)), Utility.GetFields(typeof(GameSpeed)),
new[] { speed.Value }, new[] { speed.Value },
@@ -250,7 +250,7 @@ namespace OpenRA.Mods.Common.Lint
foreach (var resource in modData.DefaultRules.Actors foreach (var resource in modData.DefaultRules.Actors
.SelectMany(actorInfo => actorInfo.Value.TraitInfos<ResourceRendererInfo>()) .SelectMany(actorInfo => actorInfo.Value.TraitInfos<ResourceRendererInfo>())
.SelectMany(info => info.ResourceTypes)) .SelectMany(info => info.ResourceTypes))
GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute( GetUsedFluentKeys(
usedKeys, testedFields, usedKeys, testedFields,
Utility.GetFields(typeof(ResourceRendererInfo.ResourceTypeInfo)), Utility.GetFields(typeof(ResourceRendererInfo.ResourceTypeInfo)),
new[] { resource.Value }, new[] { resource.Value },
@@ -258,39 +258,39 @@ namespace OpenRA.Mods.Common.Lint
const BindingFlags Binding = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static; const BindingFlags Binding = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
var constFields = modData.ObjectCreator.GetTypes().SelectMany(modType => modType.GetFields(Binding)).Where(f => f.IsLiteral); var constFields = modData.ObjectCreator.GetTypes().SelectMany(modType => modType.GetFields(Binding)).Where(f => f.IsLiteral);
GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute( GetUsedFluentKeys(
usedKeys, testedFields, usedKeys, testedFields,
constFields, constFields,
new[] { (object)null }, new[] { (object)null },
(obj, field) => $"`{field.ReflectedType.Name}.{field.Name}`"); (obj, field) => $"`{field.ReflectedType.Name}.{field.Name}`");
var modMetadataFields = typeof(ModMetadata).GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance); var modMetadataFields = typeof(ModMetadata).GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute( GetUsedFluentKeys(
usedKeys, testedFields, usedKeys, testedFields,
modMetadataFields, modMetadataFields,
new[] { modData.Manifest.Metadata }, new[] { modData.Manifest.Metadata },
(obj, field) => $"`Metadata.{field.Name}` in mod.yaml"); (obj, field) => $"`Metadata.{field.Name}` in mod.yaml");
var modContent = modData.Manifest.Get<ModContent>(); var modContent = modData.Manifest.Get<ModContent>();
GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute( GetUsedFluentKeys(
usedKeys, testedFields, usedKeys, testedFields,
Utility.GetFields(typeof(ModContent)), Utility.GetFields(typeof(ModContent)),
new[] { modContent }, new[] { modContent },
(obj, field) => $"`ModContent.{field.Name}` in mod.yaml"); (obj, field) => $"`ModContent.{field.Name}` in mod.yaml");
GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute( GetUsedFluentKeys(
usedKeys, testedFields, usedKeys, testedFields,
Utility.GetFields(typeof(ModContent.ModPackage)), Utility.GetFields(typeof(ModContent.ModPackage)),
modContent.Packages.Values.ToArray(), modContent.Packages.Values.ToArray(),
(obj, field) => $"`ModContent.Packages.ContentPackage.{field.Name}` in mod.yaml"); (obj, field) => $"`ModContent.Packages.ContentPackage.{field.Name}` in mod.yaml");
GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute( GetUsedFluentKeys(
usedKeys, testedFields, usedKeys, testedFields,
Utility.GetFields(typeof(HotkeyDefinition)), Utility.GetFields(typeof(HotkeyDefinition)),
modData.Hotkeys.Definitions, modData.Hotkeys.Definitions,
(obj, field) => $"`{obj.Name}.{field.Name}` in hotkeys yaml"); (obj, field) => $"`{obj.Name}.{field.Name}` in hotkeys yaml");
// All keycodes and modifiers should be marked as used, as they can all be configured for use at hotkeys at runtime. // All keycodes and modifiers should be marked as used, as they can all be configured for use at hotkeys at runtime.
GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute( GetUsedFluentKeys(
usedKeys, testedFields, usedKeys, testedFields,
Utility.GetFields(typeof(KeycodeExts)).Concat(Utility.GetFields(typeof(ModifiersExts))), Utility.GetFields(typeof(KeycodeExts)).Concat(Utility.GetFields(typeof(ModifiersExts))),
new[] { (object)null }, new[] { (object)null },
@@ -322,7 +322,7 @@ namespace OpenRA.Mods.Common.Lint
return (usedKeys, testedFields); return (usedKeys, testedFields);
} }
static void GetUsedTranslationKeysFromFieldsWithTranslationReferenceAttribute<T>( static void GetUsedFluentKeys<T>(
Keys usedKeys, List<FieldInfo> testedFields, Keys usedKeys, List<FieldInfo> testedFields,
IEnumerable<FieldInfo> newFields, IEnumerable<T> objects, IEnumerable<FieldInfo> newFields, IEnumerable<T> objects,
Func<T, FieldInfo, string> getContext) Func<T, FieldInfo, string> getContext)