Resolve ReSharper 2025.2 warnings (#85)

Author: vbaderks

.editorconfig

@@ -57,6 +57,7 @@ csharp_style_var_for_built_in_types = false:none
 csharp_style_var_when_type_is_apparent = true:suggestion
 csharp_style_var_elsewhere = true:none
 csharp_style_namespace_declarations = file_scoped
+csharp_style_prefer_utf8_string_literals = false:suggestion
 csharp_prefer_braces = when_multiline:suggestion
 
 dotnet_sort_system_directives_first = true
@@ -67,4 +68,9 @@ dotnet_style_qualification_for_field = false:suggestion
 dotnet_style_qualification_for_method = false:suggestion
 dotnet_style_qualification_for_property = false:suggestion
 
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+
+resharper_remove_redundant_braces_highlighting=none # Not compatible with using no braces when throwing.
+resharper_arrange_redundant_parentheses_highlighting=none # Complains about parentheses with mixed operators.
+
 

.globalconfig

@@ -68,3 +68,11 @@ dotnet_diagnostic.IDE0046.severity = none
 # IDE0010: Add missing swtich cases
 # Rational: Conflicts with code coverage.
 dotnet_diagnostic.IDE0010.severity = none
+
+# IDE0011: Add braces
+# Rational: Cannot handle that mixed usage of single line, multi line and non for throwing exceptions.
+dotnet_diagnostic.IDE0011.severity = none
+
+# IDE0011: Remove unnecessary parentheses
+# Rational: dotnet_style_parentheses_in_arithmetic_binary_operators doesn't always work
+dotnet_diagnostic.IDE0047.severity = none

CharLSDotNet.sln.DotSettings

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckNamespace/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterOnlyUsedForPreconditionCheck_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BT/@EntryIndexedValue">BT</s:String>

Directory.Packages.props

@@ -3,8 +3,8 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="SharpFuzz" Version="2.2.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="xunit.v3" Version="3.0.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
+    <PackageVersion Include="xunit.v3" Version="3.0.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />

benchmark/Micro/Abs.cs

@@ -8,8 +8,8 @@ namespace CharLS.Managed.Benchmark.Micro;
 
 public class Abs
 {
-    private int[] _source = default!;
-    private int[] _destination = default!;
+    private int[] _source = null!;
+    private int[] _destination = null!;
 
     [Params(65536)]
     public int BufferCount { get; set; }
@@ -70,7 +70,7 @@ public void InRangeWithNoAbs()
     {
         for (int i = 0; i != _source.Length; i++)
         {
-            if (_source![i] < 5000 || _source[i]> 5000)
+            if (_source[i] is < 5000 or > 5000)
             {
                 _destination[i] = _source[i];
             }

benchmark/Micro/BlockCopy.cs

@@ -9,8 +9,8 @@ namespace CharLS.Managed.Benchmark.Micro;
 
 public class BlockCopy
 {
-    private byte[] _source = default!;
-    private byte[] _destination = default!;
+    private byte[] _source = null!;
+    private byte[] _destination = null!;
 
     [Params(65536)]
     public int BufferCount { get; set; }

benchmark/Micro/ComputeReconstructedSample.cs

@@ -7,11 +7,11 @@ namespace CharLS.Managed.Benchmark.Micro;
 
 public class ComputeReconstructedSample
 {
-    private Traits _traits = default!;
-    private Traits _traitsLossy = default!;
-    private Traits _losslessTraits = default!;
-    private Traits _losslessTraits8 = default!;
-    private Traits _losslessTraits16 = default!;
+    private Traits _traits = null!;
+    private Traits _traitsLossy = null!;
+    private Traits _losslessTraits = null!;
+    private Traits _losslessTraits8 = null!;
+    private Traits _losslessTraits16 = null!;
     private int _predictedValue;
     private int _errorValue;
 

benchmark/Micro/GenericColorTransformation.cs

@@ -40,8 +40,8 @@ internal TripletByte(byte v1, byte v2, byte v3)
 
 public class ColorTransformation
 {
-    private byte[] _source = default!;
-    private byte[] _destination = default!;
+    private byte[] _source = null!;
+    private byte[] _destination = null!;
 
     [Params(2000)]
     public int PixelCount { get; set; }
@@ -81,7 +81,7 @@ internal static int TransformHP1IntParametersReturnUint(int red, int green, int
         const int range = 1 << (sizeof(byte) * 8);
 
         return
-            (((byte)(red - green + (range / 2))) << 16) |
+            ((byte)(red - green + (range / 2)) << 16) |
             ((byte)green << 8) |
             (byte)(blue - green + (range / 2));
     }
@@ -164,15 +164,15 @@ public void TransformHP1ExplicitIntParametersWithRef()
     [Benchmark]
     public unsafe void TransformHP1ExplicitIntParametersWithPointers()
     {
-        fixed (byte* bptr = _source, pd = _destination)
+        fixed (byte* source = _source, pd = _destination)
         {
-            var sourcePTr = (Triplet<byte>*)bptr;
+            var sourcePtr = (Triplet<byte>*)source;
             var destinationPtr = (Triplet<byte>*)pd;
-            Triplet<byte>* endPtr = sourcePTr + PixelCount;
+            Triplet<byte>* endPtr = sourcePtr + PixelCount;
 
-            for (; sourcePTr != endPtr; sourcePTr++, destinationPtr++)
+            for (; sourcePtr != endPtr; sourcePtr++, destinationPtr++)
             {
-                *destinationPtr = TransformHP1IntParameters(sourcePTr->V1, sourcePTr->V2, sourcePTr->V3);
+                *destinationPtr = TransformHP1IntParameters(sourcePtr->V1, sourcePtr->V2, sourcePtr->V3);
             }
         }
     }

samples/Convert/Program.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Team CharLS.
 // SPDX-License-Identifier: BSD-3-Clause
 
-using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using System.Drawing.Imaging;
 using CharLS.Managed;
@@ -84,7 +83,7 @@
 // chose for the in-memory representation of the bitmap data.
 // PNG 8bits/grayscale is loaded as PixelFormat32bppARGB
 // JPG/TIFF 8bits/grayscale are loaded as PixelFormat8bppIndexed
-bool TryGetFrameInfoAndPixelFormat(Image sourceImage, [NotNullWhen(true)] out FrameInfo frameInfo, out PixelFormat filePixelFormat)
+static bool TryGetFrameInfoAndPixelFormat(Image sourceImage, out FrameInfo frameInfo, out PixelFormat filePixelFormat)
 {
     var pixelFormat = sourceImage.PixelFormat;
     var flags = sourceImage.Flags;
@@ -117,18 +116,18 @@ bool TryGetFrameInfoAndPixelFormat(Image sourceImage, [NotNullWhen(true)] out Fr
     return filePixelFormat != default;
 }
 
-string GetOutputPath(string inputPathArg)
+static string GetOutputPath(string inputPathArg)
 {
     return Path.ChangeExtension(inputPathArg, ".jls");
 }
 
-void Save(string path, ReadOnlySpan<byte> encodedData)
+static void Save(string path, ReadOnlySpan<byte> encodedData)
 {
     using FileStream output = new(path, FileMode.OpenOrCreate);
     output.Write(encodedData);
 }
 
-bool TryParseArguments(IReadOnlyList<string> args, out string inputPathArg)
+static bool TryParseArguments(IReadOnlyList<string> args, out string inputPathArg)
 {
     if (args.Count != 1)
     {
@@ -140,7 +139,7 @@ bool TryParseArguments(IReadOnlyList<string> args, out string inputPathArg)
     return true;
 }
 
-void ConvertBgrToRgb(Span<byte> pixels, int width, int height, int stride)
+static void ConvertBgrToRgb(Span<byte> pixels, int width, int height, int stride)
 {
     const int bytesPerRgbPixel = 3;
 
@@ -158,7 +157,7 @@ void ConvertBgrToRgb(Span<byte> pixels, int width, int height, int stride)
     }
 }
 
-SpiffColorSpace MapComponentCountToSpiffColorSpace(int componentCount)
+static SpiffColorSpace MapComponentCountToSpiffColorSpace(int componentCount)
 {
     return componentCount switch
     {

test/TraitsTest.cs

@@ -25,7 +25,7 @@ public void ModuloRange()
         {
             var errorValue = traits.ModuloRange(i);
             const int range = 24 + 1;
-            Assert.True(errorValue is >= (-range / 2) and <= (((range + 1) / 2) - 1));
+            Assert.True(errorValue is >= -range / 2 and <= ((range + 1) / 2) - 1);
         }
     }
 }