From 4835666c4aef3446e856fe444634bf8569b896de Mon Sep 17 00:00:00 2001
From: Mark Ridgwell <credfeto@users.noreply.github.com>
Date: Fri, 19 Apr 2024 15:32:50 +0100
Subject: [PATCH] Fixed code analysis issues

---
 src/ChangeLog.sln.DotSettings                  |  3 +++
 .../Credfeto.ChangeLog.Cmd.csproj              |  2 ++
 .../Credfeto.ChangeLog.Tests.csproj            |  1 +
 src/Credfeto.ChangeLog/ChangeLogChecker.cs     |  8 +++++---
 src/Credfeto.ChangeLog/ChangeLogUpdater.cs     | 18 ++++++++++--------
 .../Credfeto.ChangeLog.csproj                  |  1 +
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/ChangeLog.sln.DotSettings b/src/ChangeLog.sln.DotSettings
index aabe8435..a259937b 100644
--- a/src/ChangeLog.sln.DotSettings
+++ b/src/ChangeLog.sln.DotSettings
@@ -374,6 +374,8 @@
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=8b8504e3_002Df0be_002D4c14_002D9103_002Dc732f2bddc15/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Enum members"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ENUM_MEMBER" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -424,6 +426,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=weth/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=uniswap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ecdsa/@EntryIndexedValue">True</s:Boolean>
diff --git a/src/Credfeto.ChangeLog.Cmd/Credfeto.ChangeLog.Cmd.csproj b/src/Credfeto.ChangeLog.Cmd/Credfeto.ChangeLog.Cmd.csproj
index 2a631d4c..26eb9b80 100644
--- a/src/Credfeto.ChangeLog.Cmd/Credfeto.ChangeLog.Cmd.csproj
+++ b/src/Credfeto.ChangeLog.Cmd/Credfeto.ChangeLog.Cmd.csproj
@@ -4,6 +4,8 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>true</EnableMicrosoftExtensionsConfigurationBinderSourceGenerator>
     <EnablePackageValidation>true</EnablePackageValidation>
+    <EnableRequestDelegateGenerator>true</EnableRequestDelegateGenerator>
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <Features>strict;flow-analysis</Features>
     <GenerateNeutralResourcesLanguageAttribute>true</GenerateNeutralResourcesLanguageAttribute>
     <IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
diff --git a/src/Credfeto.ChangeLog.Tests/Credfeto.ChangeLog.Tests.csproj b/src/Credfeto.ChangeLog.Tests/Credfeto.ChangeLog.Tests.csproj
index 3de3746c..2f9fbeba 100644
--- a/src/Credfeto.ChangeLog.Tests/Credfeto.ChangeLog.Tests.csproj
+++ b/src/Credfeto.ChangeLog.Tests/Credfeto.ChangeLog.Tests.csproj
@@ -27,6 +27,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <UseSystemResourceKeys>true</UseSystemResourceKeys>
     <WarningsAsErrors />
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
   </PropertyGroup>
   <PropertyGroup>
     <AnalysisLevel>latest</AnalysisLevel>
diff --git a/src/Credfeto.ChangeLog/ChangeLogChecker.cs b/src/Credfeto.ChangeLog/ChangeLogChecker.cs
index 8e0e59a1..4fcdee3b 100644
--- a/src/Credfeto.ChangeLog/ChangeLogChecker.cs
+++ b/src/Credfeto.ChangeLog/ChangeLogChecker.cs
@@ -121,12 +121,14 @@ private static bool CheckForChangesAfterFirstRelease(PatchEntryChanges change, i
     private static string ExtractPatchDetails(string patch)
     {
         Console.WriteLine(patch);
-        List<string> lines = patch.Split('\n')
-                                  .ToList();
+        List<string> lines =
+        [
+            ..patch.Split('\n')
+        ];
 
         RemoveLastLineIfBlank(lines);
 
-        int lastHunk = lines.FindLastIndex(x => CommonRegex.GitHunkPosition.IsMatch(x));
+        int lastHunk = lines.FindLastIndex(CommonRegex.GitHunkPosition.IsMatch);
 
         if (lastHunk != -1)
         {
diff --git a/src/Credfeto.ChangeLog/ChangeLogUpdater.cs b/src/Credfeto.ChangeLog/ChangeLogUpdater.cs
index b403952f..9ffd582c 100644
--- a/src/Credfeto.ChangeLog/ChangeLogUpdater.cs
+++ b/src/Credfeto.ChangeLog/ChangeLogUpdater.cs
@@ -35,14 +35,14 @@ public static async Task RemoveEntryAsync(string changeLogFileName, string type,
 
     private static async Task<string> ReadChangeLogAsync(string changeLogFileName, CancellationToken cancellationToken)
     {
-        if (!File.Exists(changeLogFileName))
+        if (File.Exists(changeLogFileName))
         {
-            await CreateEmptyAsync(changeLogFileName: changeLogFileName, cancellationToken: cancellationToken);
-
-            return TemplateFile.Initial;
+            return await File.ReadAllTextAsync(path: changeLogFileName, encoding: Encoding.UTF8, cancellationToken: cancellationToken);
         }
 
-        return await File.ReadAllTextAsync(path: changeLogFileName, encoding: Encoding.UTF8, cancellationToken: cancellationToken);
+        await CreateEmptyAsync(changeLogFileName: changeLogFileName, cancellationToken: cancellationToken);
+
+        return TemplateFile.Initial;
     }
 
     public static string AddEntry(string changeLog, string type, string message)
@@ -68,9 +68,11 @@ private static string AddEntryCommon(string changeLog, string type, string messa
 
     private static List<string> ChangeLogAsLines(string changeLog)
     {
-        return EnsureChangelog(changeLog)
-               .SplitToLines()
-               .ToList();
+        return
+        [
+            .. EnsureChangelog(changeLog)
+                .SplitToLines()
+        ];
     }
 
     public static string RemoveEntry(string changeLog, string type, string message)
diff --git a/src/Credfeto.ChangeLog/Credfeto.ChangeLog.csproj b/src/Credfeto.ChangeLog/Credfeto.ChangeLog.csproj
index f5f23706..45c4fd03 100644
--- a/src/Credfeto.ChangeLog/Credfeto.ChangeLog.csproj
+++ b/src/Credfeto.ChangeLog/Credfeto.ChangeLog.csproj
@@ -29,6 +29,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <UseSystemResourceKeys>true</UseSystemResourceKeys>
     <WarningsAsErrors />
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
   </PropertyGroup>
   <PropertyGroup>
     <AnalysisLevel>latest</AnalysisLevel>