Ran code analysis and fixed suggestions that showed up.

natekford · Jan 26, 2024 · cd9b81b · cd9b81b
1 parent 34fb431
commit cd9b81b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/samples/NarrativeCharts.Bookworm/Meta/Time/BookwormTime.cs b/samples/NarrativeCharts.Bookworm/Meta/Time/BookwormTime.cs
@@ -17,8 +17,8 @@ public static class BookwormTime
 
 	public static ImmutableDictionary<string, int> Aliases { get; }
 	// source: https://w.atwiki.jp/booklove/pages/195.html#footnote_body_2
-	public static ImmutableArray<int> Lengths { get; } = new[]
-	{
+	public static ImmutableArray<int> Lengths { get; } =
+	[
 		4,
 		3,
 		3,
@@ -27,7 +27,7 @@ public static class BookwormTime
 		2,
 		3,
 		4,
-	}.ToImmutableArray();
+	];
 
 	static BookwormTime()
 	{

diff --git a/src/NarrativeCharts.Console/Program.cs b/src/NarrativeCharts.Console/Program.cs
@@ -52,7 +52,7 @@ private static async Task Main(string[] args)
 	{
 		try
 		{
-			await new Program(args.ToImmutableArray()).RunAsync().ConfigureAwait(false);
+			await new Program([.. args]).RunAsync().ConfigureAwait(false);
 		}
 		catch (Exception e)
 		{

diff --git a/src/NarrativeCharts/Models/Meta/AliasAttribute.cs b/src/NarrativeCharts/Models/Meta/AliasAttribute.cs
@@ -12,5 +12,5 @@ public sealed class AliasAttribute(params string[] aliases) : Attribute
 	/// <summary>
 	/// The aliases to use.
 	/// </summary>
-	public ImmutableArray<string> Aliases { get; } = aliases.ToImmutableArray();
+	public ImmutableArray<string> Aliases { get; } = [.. aliases];
 }
diff --git a/src/NarrativeCharts/Models/Meta/MetaUtils.cs b/src/NarrativeCharts/Models/Meta/MetaUtils.cs
@@ -28,9 +28,7 @@ public static ImmutableDictionary<string, T> GetAliases<T>(
 				aliases.TryAdd(convertValue(value), value);
 			}
 
-			var cAliases = prop.GetCustomAttribute<AliasAttribute>()?.Aliases
-				?? ImmutableArray<string>.Empty;
-			foreach (var alias in cAliases)
+			foreach (var alias in prop.GetCustomAttribute<AliasAttribute>()?.Aliases ?? [])
 			{
 				aliases.Add(alias, value);
 			}

diff --git a/tests/NarrativeCharts.Tests/NarrativeCharts.Tests.csproj b/tests/NarrativeCharts.Tests/NarrativeCharts.Tests.csproj
@@ -17,6 +17,7 @@
 		<CollectCoverage>true</CollectCoverage>
 		<CoverletOutputFormat>lcov</CoverletOutputFormat>
 		<CoverletOutput>./lcov.info</CoverletOutput>
+		<NeutralLanguage>en-US</NeutralLanguage>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/tests/NarrativeCharts.Tests/Scripting/Scripting_Tests.cs b/tests/NarrativeCharts.Tests/Scripting/Scripting_Tests.cs
@@ -181,7 +181,7 @@ public async Task ScriptDefinitionsSaveAndLoad_Valid()
 	[GeneratedRegex(@"P(\d+)V(\d+)")]
 	private static partial Regex BookNumberRegex();
 
-	private async Task CreateFakeFilesAsync(
+	private static async Task CreateFakeFilesAsync(
 		ScriptDefinitions defs,
 		IEnumerable<FakeScriptConverter> scripts)
 	{
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ private static async Task Main(string[] args) @@
     	{
     		try
     		{
-    			await new Program(args.ToImmutableArray()).RunAsync().ConfigureAwait(false);
+    			await new Program([.. args]).RunAsync().ConfigureAwait(false);
     		}
     		catch (Exception e)
     		{
@@ Expand Down @@