refs

VerifyTests · Nov 14, 2024 · f3f7b91 · f3f7b91
1 parent 3751449
commit f3f7b91
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/.editorconfig b/src/.editorconfig
@@ -11,6 +11,11 @@ indent_style = space
 indent_size = 4
 charset = utf-8
 
+# Redundant accessor body
+resharper_redundant_accessor_body_highlighting = error
+
+# Replace with field keyword
+resharper_replace_with_field_keyword_highlighting = error
 
 # Declare types in namespaces
 dotnet_diagnostic.CA1050.severity = None
@@ -200,7 +205,8 @@ resharper_field_can_be_made_read_only_local_highlighting = none
 resharper_merge_into_logical_pattern_highlighting = warning
 resharper_merge_into_pattern_highlighting = error
 resharper_method_has_async_overload_highlighting = warning
-resharper_partial_type_with_single_part_highlighting = error
+# because stop rider giving errors before source generators have run
+resharper_partial_type_with_single_part_highlighting = warning
 resharper_redundant_base_qualifier_highlighting = warning
 resharper_redundant_cast_highlighting = error
 resharper_redundant_empty_object_creation_argument_list_highlighting = error

diff --git a/src/DiffEngine/DiffTools_Add.cs b/src/DiffEngine/DiffTools_Add.cs
@@ -10,7 +10,15 @@ public static partial class DiffTools
             return null;
         }
 
-        return AddTool(name, autoRefresh ?? existing.AutoRefresh, isMdi ?? existing.IsMdi, supportsText ?? existing.SupportsText, requiresTarget ?? existing.RequiresTarget, launchArguments ?? existing.LaunchArguments, exePath ?? existing.ExePath, binaryExtensions ?? existing.BinaryExtensions);
+        return AddTool(
+            name,
+            autoRefresh ?? existing.AutoRefresh,
+            isMdi ?? existing.IsMdi,
+            supportsText ?? existing.SupportsText,
+            requiresTarget ?? existing.RequiresTarget,
+            launchArguments ?? existing.LaunchArguments,
+            exePath ?? existing.ExePath,
+            binaryExtensions ?? existing.BinaryExtensions);
     }
 
     public static ResolvedTool? AddTool(string name, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaryExtensions, OsSupport osSupport) =>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageVersion Include="Argon" Version="0.24.2" />
     <PackageVersion Include="Caseless.Fody" Version="1.9.1" />
-    <PackageVersion Include="EmptyFiles" Version="8.5.0" />
+    <PackageVersion Include="EmptyFiles" Version="8.5.1" />
     <PackageVersion Include="Fody" Version="6.8.2" />
     <PackageVersion Include="MarkdownSnippets.MsBuild" Version="27.0.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
@@ -16,10 +16,6 @@
     <PackageVersion Include="Serilog" Version="4.1.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
-    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
-    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
-    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
-    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
     <PackageVersion Include="System.Globalization.Extensions" Version="4.3.0" />
     <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
     <PackageVersion Include="System.Management" Version="9.0.0" />