claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce more Linq usage

Browse Source
This commit is contained in:
Matt Nadareski
2024-12-06 13:57:48 -05:00
parent ea753aeb06
commit d78ff5eb67
7 changed files with 89 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SabreTools.Core/Tools/TextHelper.cs
View File

@@ -87,7 +87,7 @@ namespace SabreTools.Core.Tools
if (string.IsNullOrEmpty(input))
return string.Empty;
return new string(input.Where(c => c <= 255).ToArray());
return new string(input!.Where(c => c <= 255).ToArray());
}
#endregion

23
SabreTools.Core/Tools/TypeHelper.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Xml.Serialization;
using SabreTools.Models;
@@ -22,21 +21,13 @@ namespace SabreTools.Core.Tools
if (fields == null)
return null;
#if NET20 || NET35 || NET40
return fields
.Where(f => f.IsLiteral && !f.IsInitOnly)
.Where(f => Attribute.GetCustomAttributes(f, typeof(NoFilterAttribute)).Length == 0)
.Select(f => f.GetRawConstantValue() as string)
.Where(v => v != null)
.ToArray()!;
#else
return fields
.Where(f => f.IsLiteral && !f.IsInitOnly)
.Where(f => !f.CustomAttributes.Any(a => a.AttributeType == typeof(NoFilterAttribute)))
.Select(f => f.GetRawConstantValue() as string)
.Where(v => v != null)
.ToArray()!;
#endif
FieldInfo[] noFilterFields = Array.FindAll(fields,
f => f.IsLiteral
&& !f.IsInitOnly
&& Attribute.GetCustomAttributes(f, typeof(NoFilterAttribute)).Length == 0);
string[] constantValues = Array.ConvertAll(noFilterFields,
f => (f.GetRawConstantValue() as string) ?? string.Empty);
return Array.FindAll(constantValues, s => s.Length > 0);
}
/// <summary>