refactor/fix code to clear up qodana errors/warnings

Author: arturcic

.editorconfig

@@ -58,19 +58,12 @@ dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
 dotnet_style_prefer_simplified_interpolation = true:suggestion
-
-# Dispose rules (CA2000 and CA2213) ported to IDE analyzers. We already execute the CA rules on the repo, so disable the IDE ones.
-dotnet_diagnostic.IDE0005.severity = none
-dotnet_diagnostic.IDE0067.severity = none
-dotnet_diagnostic.IDE0068.severity = none
-dotnet_diagnostic.IDE0069.severity = none
-dotnet_diagnostic.CA1016.severity = none
 #### C# Coding Conventions ####
 
 # Prefer "var" everywhere
-csharp_style_var_for_built_in_types = true:silent
-csharp_style_var_when_type_is_apparent = true:silent
-csharp_style_var_elsewhere = true:silent
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
 
 # Prefer method-like constructs to have a block body, except for lambdas
 csharp_style_expression_bodied_methods = true:warning
@@ -152,38 +145,15 @@ csharp_space_between_method_call_parameter_list_parentheses = false
 csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
 csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
-csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
 
+resharper_csharp_use_roslyn_logic_for_evident_types = true
+
 # Alignment
-align_multiline_parameter = true
+resharper_csharp_align_multiline_parameter = true
 
 # Qualify fields with "this."
-csharp_instance_members_qualify_members = field
-
-# IDE0011: Add braces
-dotnet_diagnostic.IDE0011.severity = none
-
-# IDE0090: Use 'new(...)'
-dotnet_diagnostic.IDE0090.severity = warning
-
-# IDE0041: Use 'is null' check
-dotnet_diagnostic.IDE0041.severity = warning
-
-# CA1825: Avoid zero-length array allocations
-dotnet_diagnostic.CA1825.severity = warning
-
-# CA1822: Mark members as static
-dotnet_diagnostic.CA1822.severity = warning
-
-# CA2208: Instantiate argument exceptions correctly
-dotnet_diagnostic.CA2208.severity = warning
-
-# CA1810: Initialize reference type static fields inline
-dotnet_diagnostic.CA1810.severity = warning
-
-# CA1816: Dispose methods should call SuppressFinalize
-dotnet_diagnostic.CA1816.severity = warning
+resharper_csharp_instance_members_qualify_members = field
 
 # IDE0005: Using directive is unnecessary.
 dotnet_diagnostic.IDE0005.severity = warning
@@ -194,4 +164,10 @@ dotnet_diagnostic.RCS1037.severity = error
 # RCS1036: Remove redundant empty line.
 dotnet_diagnostic.RCS1036.severity = error
 
-[resharper_]xml_space_before_self_closing = true
+xml_space_before_self_closing = true
+
+resharper_arrange_object_creation_when_type_not_evident_highlighting = none
+
+resharper_unused_auto_property_accessor_global_highlighting = none
+
+resharper_unused_method_return_value_global_highlighting = none

.gitignore

@@ -61,7 +61,6 @@ TestResults
 ClientBin
 stylecop.*
 ~$*
-*~
 *.dbmdl
 site/
 Generated_Code #added for RIA/Silverlight projects

src/GitVersion.App.Tests/ArgumentParserTests.cs

@@ -361,7 +361,7 @@ public void UpdateAssemblyInfoWithRelativeFilename()
         var targetPath = FileSystemHelper.Path.Combine(repo.RepositoryPath, "subdir1", "subdir2");
         this.fileSystem.Directory.CreateDirectory(targetPath);
 
-        var arguments = this.argumentParser.ParseArguments($"-targetpath {targetPath} -updateAssemblyInfo ..\\..\\CommonAssemblyInfo.cs");
+        var arguments = this.argumentParser.ParseArguments($@"-targetpath {targetPath} -updateAssemblyInfo ..\..\CommonAssemblyInfo.cs");
         arguments.UpdateAssemblyInfo.ShouldBe(true);
         arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
         arguments.UpdateAssemblyInfoFileName.ShouldContain(x => FileSystemHelper.Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
@@ -604,7 +604,7 @@ public void EnsureAssemblyInfoFalse()
     [Test]
     public void DynamicRepoLocation()
     {
-        var arguments = this.argumentParser.ParseArguments(@"-dynamicRepoLocation /tmp/foo");
+        var arguments = this.argumentParser.ParseArguments("-dynamicRepoLocation /tmp/foo");
         arguments.ClonePath.ShouldBe("/tmp/foo");
     }
 

src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs

@@ -25,11 +25,15 @@ public void LogPathContainsForwardSlash()
         fixture.MakeATaggedCommit("1.2.3");
         fixture.MakeACommit();
 
-        var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, @" /l ""/tmp/path""", false);
+        var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath,
+            """ /l "/tmp/path" """, false);
 
         result.ExitCode.ShouldBe(0);
         result.Output.ShouldNotBeNull();
-        result.Output.ShouldContain(@"""MajorMinorPatch"": ""1.2.4""");
+        result.Output.ShouldContain(
+            """
+                    "MajorMinorPatch": "1.2.4"
+                    """);
     }
 
     [Theory]
@@ -42,7 +46,8 @@ public void CheckBuildServerVerbosityConsole(string verbosityArg, string expecte
         fixture.MakeATaggedCommit("1.2.3");
         fixture.MakeACommit();
 
-        var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, $@" {verbosityArg} -output buildserver /l ""/tmp/path""", false);
+        var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath,
+            $""" {verbosityArg} -output buildserver /l "/tmp/path" """, false);
 
         result.ExitCode.ShouldBe(0);
         result.Output.ShouldNotBeNull();

src/GitVersion.App.Tests/HelpWriterTests.cs

@@ -35,7 +35,7 @@ public void AllArgsAreInHelp()
             { nameof(Arguments.ShowVariable), "/showvariable" },
             { nameof(Arguments.Format), "/format" }
         };
-        string helpText = string.Empty;
+        var helpText = string.Empty;
 
         this.helpWriter.WriteTo(s => helpText = s);
 
@@ -51,7 +51,7 @@ public void AllArgsAreInHelp()
             .ShouldBeEmpty();
     }
 
-    private static bool IsNotInHelp(IReadOnlyDictionary<string, string> lookup, string propertyName, string helpText)
+    private static bool IsNotInHelp(Dictionary<string, string> lookup, string propertyName, string helpText)
     {
         if (lookup.TryGetValue(propertyName, out var value))
             return !helpText.Contains(value);

src/GitVersion.App.Tests/Helpers/ExecutionResults.cs

@@ -6,8 +6,8 @@ namespace GitVersion.App.Tests;
 
 public class ExecutionResults(int exitCode, string? output, string? logContents = null)
 {
-    public int ExitCode { get; init; } = exitCode;
-    public string? Output { get; init; } = output;
+    public int ExitCode { get; } = exitCode;
+    public string? Output { get; } = output;
     public string? Log { get; init; } = logContents;
 
     public GitVersionVariables? OutputVariables

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

@@ -49,7 +49,7 @@ public void WithEnv(params KeyValuePair<string, string>[] envs)
 
     public Task<ExecutionResults> Run(string arg)
     {
-        var args = arg.Split([' '], StringSplitOptions.RemoveEmptyEntries).ToArray();
+        var args = arg.Split([' '], StringSplitOptions.RemoveEmptyEntries);
         return Run(args);
     }
 

src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs

@@ -39,7 +39,7 @@ public void WixVersionFileVarCountTest()
         var gitVersionVarsInWix = GetGitVersionVarsInWixFile(FileSystemHelper.Path.Combine(fixture.RepositoryPath, this.wixVersionFileName));
         var gitVersionVars = GitVersionVariables.AvailableVariables;
 
-        Assert.That(gitVersionVarsInWix, Has.Count.EqualTo(gitVersionVars.Count()));
+        Assert.That(gitVersionVarsInWix, Has.Count.EqualTo(gitVersionVars.Count));
     }
 
     [Test]

src/GitVersion.App.Tests/VersionWriterTests.cs

@@ -22,7 +22,7 @@ public void WriteVersionShouldWriteFileVersionWithNoPrereleaseTag()
     {
         var asm = GenerateAssembly(new Version(1, 0, 0), "");
 
-        string? version = string.Empty;
+        var version = string.Empty;
         this.versionWriter.WriteTo(asm, v => version = v);
         Assert.Multiple(() =>
         {
@@ -36,7 +36,7 @@ public void WriteVersionShouldWriteFileVersionWithPrereleaseTag()
     {
         var asm = GenerateAssembly(new Version(1, 0, 0), "-beta4");
 
-        string? version = string.Empty;
+        var version = string.Empty;
         this.versionWriter.WriteTo(asm, v => version = v);
         Assert.Multiple(() =>
         {
@@ -48,7 +48,7 @@ public void WriteVersionShouldWriteFileVersionWithPrereleaseTag()
     private static Assembly GenerateAssembly(Version fileVersion, string prereleaseInfo)
     {
         var attribute = typeof(AssemblyInformationalVersionAttribute);
-        var csharpCode = $@"[assembly: {attribute.FullName}(""{fileVersion + prereleaseInfo}"")]";
+        var csharpCode = $"""[assembly: {attribute.FullName}("{fileVersion + prereleaseInfo}")]""";
         var compilation = CSharpCompilation.Create("test-asm")
             .WithOptions(new(OutputKind.DynamicallyLinkedLibrary))
             .AddReferences(MetadataReference.CreateFromFile(typeof(object).Assembly.Location))

src/GitVersion.App/ArgumentParser.cs

@@ -177,25 +177,23 @@ private void ParseTargetPath(Arguments arguments, string? name, IReadOnlyList<st
         var couldNotParseMessage = $"Could not parse command line parameter '{name}'.";
 
         // If we've reached through all argument switches without a match, we can relatively safely assume that the first argument isn't a switch, but the target path.
-        if (parseEnded)
+        if (!parseEnded) throw new WarningException(couldNotParseMessage);
+        if (name?.StartsWith('/') == true)
         {
-            if (name?.StartsWith('/') == true)
-            {
-                if (FileSystemHelper.Path.DirectorySeparatorChar == '/' && name.IsValidPath())
-                {
-                    arguments.TargetPath = name;
-                    return;
-                }
-            }
-            else if (!name.IsSwitchArgument())
+            if (FileSystemHelper.Path.DirectorySeparatorChar == '/' && name.IsValidPath())
             {
                 arguments.TargetPath = name;
                 return;
             }
-
-            couldNotParseMessage += " If it is the target path, make sure it exists.";
+        }
+        else if (!name.IsSwitchArgument())
+        {
+            arguments.TargetPath = name;
+            return;
         }
 
+        couldNotParseMessage += " If it is the target path, make sure it exists.";
+
         throw new WarningException(couldNotParseMessage);
     }
 
@@ -289,13 +287,9 @@ private static bool ParseSwitches(Arguments arguments, string? name, IReadOnlyLi
             return true;
         }
 
-        if (name.IsSwitch("updatewixversionfile"))
-        {
-            arguments.UpdateWixVersionFile = true;
-            return true;
-        }
-
-        return false;
+        if (!name.IsSwitch("updatewixversionfile")) return false;
+        arguments.UpdateWixVersionFile = true;
+        return true;
     }
 
     private static bool ParseConfigArguments(Arguments arguments, string? name, IReadOnlyList<string>? values, string? value)
@@ -357,14 +351,10 @@ private static bool ParseRemoteArguments(Arguments arguments, string? name, IRea
             return true;
         }
 
-        if (name.IsSwitch("b"))
-        {
-            EnsureArgumentValueCount(values);
-            arguments.TargetBranch = value;
-            return true;
-        }
-
-        return false;
+        if (!name.IsSwitch("b")) return false;
+        EnsureArgumentValueCount(values);
+        arguments.TargetBranch = value;
+        return true;
     }
 
     private static void ParseShowVariable(Arguments arguments, string? value, string? name)
@@ -379,7 +369,7 @@ private static void ParseShowVariable(Arguments arguments, string? value, string
         if (versionVariable == null)
         {
             var message = $"{name} requires a valid version variable. Available variables are:{FileSystemHelper.Path.NewLine}" +
-                          string.Join(", ", availableVariables.Select(x => string.Concat("'", x, "'")));
+                          string.Join(", ", availableVariables.Select(x => $"'{x}'"));
             throw new WarningException(message);
         }
 
@@ -562,14 +552,14 @@ private static void EnsureArgumentValueCount(IReadOnlyList<string>? values)
         }
     }
 
-    private static NameValueCollection CollectSwitchesAndValuesFromArguments(IList<string> namedArguments, out bool firstArgumentIsSwitch)
+    private static NameValueCollection CollectSwitchesAndValuesFromArguments(string[] namedArguments, out bool firstArgumentIsSwitch)
     {
         firstArgumentIsSwitch = true;
         var switchesAndValues = new NameValueCollection();
         string? currentKey = null;
         var argumentRequiresValue = false;
 
-        for (var i = 0; i < namedArguments.Count; ++i)
+        for (var i = 0; i < namedArguments.Length; ++i)
         {
             var arg = namedArguments[i];
 

src/GitVersion.App/FileSystemGlobbing/DirectoryInfoGlobbingWrapper.cs

@@ -36,30 +36,28 @@ this.directoryInfo.Parent is null
 
     public override IEnumerable<Microsoft.Extensions.FileSystemGlobbing.Abstractions.FileSystemInfoBase> EnumerateFileSystemInfos()
     {
-        if (this.directoryInfo.Exists)
+        if (!this.directoryInfo.Exists) yield break;
+        IEnumerable<IFileSystemInfo> fileSystemInfos;
+        try
         {
-            IEnumerable<IFileSystemInfo> fileSystemInfos;
-            try
-            {
-                fileSystemInfos = this.directoryInfo.EnumerateFileSystemInfos(
-                    "*",
-                    SearchOption.TopDirectoryOnly
-                );
-            }
-            catch (DirectoryNotFoundException)
-            {
-                yield break;
-            }
+            fileSystemInfos = this.directoryInfo.EnumerateFileSystemInfos(
+                "*",
+                SearchOption.TopDirectoryOnly
+            );
+        }
+        catch (DirectoryNotFoundException)
+        {
+            yield break;
+        }
 
-            foreach (var fileSystemInfo in fileSystemInfos)
+        foreach (var fileSystemInfo in fileSystemInfos)
+        {
+            yield return fileSystemInfo switch
             {
-                yield return fileSystemInfo switch
-                {
-                    IDirectoryInfo info => new DirectoryInfoGlobbingWrapper(this.fileSystem, info),
-                    IFileInfo info => new FileInfoGlobbingWrapper(this.fileSystem, info),
-                    _ => new FileSystemInfoGlobbingWrapper(this.fileSystem, fileSystemInfo),
-                };
-            }
+                IDirectoryInfo info => new DirectoryInfoGlobbingWrapper(this.fileSystem, info),
+                IFileInfo info => new FileInfoGlobbingWrapper(this.fileSystem, info),
+                _ => new FileSystemInfoGlobbingWrapper(this.fileSystem, fileSystemInfo)
+            };
         }
     }
 
@@ -82,7 +80,7 @@ this.directoryInfo.Parent is null
         {
             { Length: 1 } => new DirectoryInfoGlobbingWrapper(this.fileSystem, dirs[0], parentPath),
             { Length: 0 } => null,
-            _ => throw new InvalidOperationException($"More than one sub directories are found under {this.directoryInfo.FullName} with name {path}."),
+            _ => throw new InvalidOperationException($"More than one sub directories are found under {this.directoryInfo.FullName} with name {path}.")
         };
     }
 

src/GitVersion.App/OverrideConfigurationOptionParser.cs

@@ -41,7 +41,7 @@ internal class OverrideConfigurationOptionParser
     /// <remarks>Only simple types are supported</remarks>
     private static bool IsSupportedPropertyType(Type propertyType)
     {
-        Type unwrappedType = Nullable.GetUnderlyingType(propertyType) ?? propertyType;
+        var unwrappedType = Nullable.GetUnderlyingType(propertyType) ?? propertyType;
 
         return unwrappedType == typeof(string)
                || unwrappedType.IsEnum