Updated to latest Resharper version and removed workarounds for earlier versions

Bart Koelman · Bart Koelman · commit a61a051fb20b · 2021-12-03T18:51:37.000+01:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2021.2.2",
+      "version": "2021.3.0-eap10",
       "commands": [
         "jb"
       ]
diff --git a/JsonApiDotNetCore.sln.DotSettings b/JsonApiDotNetCore.sln.DotSettings
@@ -91,10 +91,12 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/PARENTHESES_GROUP_NON_OBVIOUS_OPERATIONS/@EntryValue">Conditional</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_STATEMENT_CONDITIONS/@EntryValue">False</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AFTER_MULTILINE_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_LOCAL_METHOD/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_MULTILINE_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_BRACES_INSIDE_STATEMENT_CONDITIONS/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FIXED_STMT/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs
@@ -281,7 +281,7 @@ private IReadOnlyCollection<EagerLoadAttribute> GetEagerLoads(Type resourceClrTy
         private static void IncludeField<TField>(Dictionary<string, TField> fieldsByName, TField field)
             where TField : ResourceFieldAttribute
         {
-            if (fieldsByName.TryGetValue(field.PublicName, out var existingField))
+            if (fieldsByName.TryGetValue(field.PublicName, out TField? existingField))
             {
                 throw CreateExceptionForDuplicatePublicName(field.Property.DeclaringType!, existingField, field);
             }
@@ -291,7 +291,7 @@ private static void IncludeField<TField>(Dictionary<string, TField> fieldsByName
 
         private void AssertNoDuplicatePublicName(ResourceType resourceType, string effectivePublicName)
         {
-            var (existingClrType, _) = _resourceTypesByClrType.FirstOrDefault(type => type.Value.PublicName == resourceType.PublicName);
+            (Type? existingClrType, _) = _resourceTypesByClrType.FirstOrDefault(type => type.Value.PublicName == resourceType.PublicName);
 
             if (existingClrType != null)
             {
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs
@@ -8,7 +8,6 @@
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SkipTakeClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SkipTakeClauseBuilder.cs
@@ -7,7 +7,8 @@
 namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
 {
     /// <summary>
-    /// Transforms <see cref="PaginationExpression" /> into <see cref="Queryable.Skip{TSource}" /> and <see cref="Queryable.Take{TSource}" /> calls.
+    /// Transforms <see cref="PaginationExpression" /> into <see cref="Queryable.Skip{TSource}" /> and
+    /// <see cref="Queryable.Take{TSource}(IQueryable{TSource},int)" /> calls.
     /// </summary>
     [PublicAPI]
     public class SkipTakeClauseBuilder : QueryClauseBuilder<object?>
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/SingleOrManyData.cs b/src/JsonApiDotNetCore/Serialization/Objects/SingleOrManyData.cs
@@ -17,8 +17,6 @@ public readonly struct SingleOrManyData<T>
         // to ensure ManyValue never contains null items.
         where T : class, IResourceIdentity, new()
     {
-        // ReSharper disable once MergeConditionalExpression
-        // Justification: ReSharper reporting this is a bug, which is fixed in v2021.2.1. This condition cannot be merged.
         public object? Value => ManyValue != null ? ManyValue : SingleValue;
 
         [JsonIgnore]
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicOperationObjectAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicOperationObjectAdapter.cs
@@ -69,10 +69,7 @@ private WriteOperationKind ConvertOperationCode(AtomicOperationObject atomicOper
             {
                 case AtomicOperationCode.Add:
                 {
-                    // ReSharper disable once MergeIntoPattern
-                    // Justification: Merging this into a pattern crashes the command-line versions of CleanupCode/InspectCode.
-                    // Tracked at: https://youtrack.jetbrains.com/issue/RSRP-486717
-                    if (atomicOperationObject.Ref != null && atomicOperationObject.Ref.Relationship == null)
+                    if (atomicOperationObject.Ref is { Relationship: null })
                     {
                         using IDisposable _ = state.Position.PushElement("ref");
                         throw new ModelConversionException(state.Position, "The 'relationship' element is required.", null);
diff --git a/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs b/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs
@@ -187,8 +187,6 @@ public IList<ResourceObject> GetResponseIncluded()
 
         private IList<ResourceObjectTreeNode> GetDirectChildren()
         {
-            // ReSharper disable once MergeConditionalExpression
-            // Justification: ReSharper reporting this is a bug, which is fixed in v2021.2.1. This condition cannot be merged.
             return _directChildren == null ? Array.Empty<ResourceObjectTreeNode>() : _directChildren;
         }
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs
@@ -5,7 +5,6 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
-using FluentAssertions.Common;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
diff --git a/test/SourceGeneratorTests/CompilationBuilder.cs b/test/SourceGeneratorTests/CompilationBuilder.cs
@@ -35,7 +35,7 @@ public CompilationBuilder WithSystemReferences()
             PortableExecutableReference systemRuntimeReference =
                 MetadataReference.CreateFromFile(Path.Combine(Path.GetDirectoryName(objectLocation)!, "System.Runtime.dll"));
 
-            foreach (var reference in new[]
+            foreach (PortableExecutableReference reference in new[]
             {
                 MetadataReference.CreateFromFile(objectLocation),
                 systemRuntimeReference
@@ -57,7 +57,7 @@ public CompilationBuilder WithLoggerFactoryReference()
 
         public CompilationBuilder WithJsonApiDotNetCoreReferences()
         {
-            foreach (var reference in new[]
+            foreach (PortableExecutableReference reference in new[]
             {
                 MetadataReference.CreateFromFile(typeof(ControllerBase).Assembly.Location),
                 MetadataReference.CreateFromFile(typeof(AttrAttribute).Assembly.Location)
diff --git a/test/SourceGeneratorTests/SourceCodeBuilder.cs b/test/SourceGeneratorTests/SourceCodeBuilder.cs
@@ -17,7 +17,7 @@ public string Build()
 
             if (_namespaceImports.Any())
             {
-                foreach (var namespaceImport in _namespaceImports)
+                foreach (string namespaceImport in _namespaceImports)
                 {
                     builder.AppendLine($"using {namespaceImport};");
                 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"jetbrains.resharper.globaltools": {`
`6`		`- "version": "2021.2.2",`
	`6`	`+ "version": "2021.3.0-eap10",`
`7`	`7`	`"commands": [`
`8`	`8`	`"jb"`
`9`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ private IReadOnlyCollection<EagerLoadAttribute> GetEagerLoads(Type resourceClrTy`
`281`	`281`	`private static void IncludeField<TField>(Dictionary<string, TField> fieldsByName, TField field)`
`282`	`282`	`where TField : ResourceFieldAttribute`
`283`	`283`	`{`
`284`		`- if (fieldsByName.TryGetValue(field.PublicName, out var existingField))`
	`284`	`+ if (fieldsByName.TryGetValue(field.PublicName, out TField? existingField))`
`285`	`285`	`{`
`286`	`286`	`throw CreateExceptionForDuplicatePublicName(field.Property.DeclaringType!, existingField, field);`
`287`	`287`	`}`
`@@ -291,7 +291,7 @@ private static void IncludeField<TField>(Dictionary<string, TField> fieldsByName`
`291`	`291`
`292`	`292`	`private void AssertNoDuplicatePublicName(ResourceType resourceType, string effectivePublicName)`
`293`	`293`	`{`
`294`		`- var (existingClrType, _) = _resourceTypesByClrType.FirstOrDefault(type => type.Value.PublicName == resourceType.PublicName);`
	`294`	`+ (Type? existingClrType, _) = _resourceTypesByClrType.FirstOrDefault(type => type.Value.PublicName == resourceType.PublicName);`
`295`	`295`
`296`	`296`	`if (existingClrType != null)`
`297`	`297`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ public readonly struct SingleOrManyData<T>`
`17`	`17`	`// to ensure ManyValue never contains null items.`
`18`	`18`	`where T : class, IResourceIdentity, new()`
`19`	`19`	`{`
`20`		`- // ReSharper disable once MergeConditionalExpression`
`21`		`- // Justification: ReSharper reporting this is a bug, which is fixed in v2021.2.1. This condition cannot be merged.`
`22`	`20`	`public object? Value => ManyValue != null ? ManyValue : SingleValue;`
`23`	`21`
`24`	`22`	`[JsonIgnore]`
Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,7 @@ private WriteOperationKind ConvertOperationCode(AtomicOperationObject atomicOper`
`69`	`69`	`{`
`70`	`70`	`case AtomicOperationCode.Add:`
`71`	`71`	`{`
`72`		`- // ReSharper disable once MergeIntoPattern`
`73`		`- // Justification: Merging this into a pattern crashes the command-line versions of CleanupCode/InspectCode.`
`74`		`- // Tracked at: https://youtrack.jetbrains.com/issue/RSRP-486717`
`75`		`- if (atomicOperationObject.Ref != null && atomicOperationObject.Ref.Relationship == null)`
	`72`	`+ if (atomicOperationObject.Ref is { Relationship: null })`
`76`	`73`	`{`
`77`	`74`	`using IDisposable _ = state.Position.PushElement("ref");`
`78`	`75`	`throw new ModelConversionException(state.Position, "The 'relationship' element is required.", null);`
Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,6 @@ public IList<ResourceObject> GetResponseIncluded()`
`187`	`187`
`188`	`188`	`private IList<ResourceObjectTreeNode> GetDirectChildren()`
`189`	`189`	`{`
`190`		`- // ReSharper disable once MergeConditionalExpression`
`191`		`- // Justification: ReSharper reporting this is a bug, which is fixed in v2021.2.1. This condition cannot be merged.`
`192`	`190`	`return _directChildren == null ? Array.Empty<ResourceObjectTreeNode>() : _directChildren;`
`193`	`191`	`}`
`194`	`192`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public CompilationBuilder WithSystemReferences()`
`35`	`35`	`PortableExecutableReference systemRuntimeReference =`
`36`	`36`	`MetadataReference.CreateFromFile(Path.Combine(Path.GetDirectoryName(objectLocation)!, "System.Runtime.dll"));`
`37`	`37`
`38`		`- foreach (var reference in new[]`
	`38`	`+ foreach (PortableExecutableReference reference in new[]`
`39`	`39`	`{`
`40`	`40`	`MetadataReference.CreateFromFile(objectLocation),`
`41`	`41`	`systemRuntimeReference`
`@@ -57,7 +57,7 @@ public CompilationBuilder WithLoggerFactoryReference()`
`57`	`57`
`58`	`58`	`public CompilationBuilder WithJsonApiDotNetCoreReferences()`
`59`	`59`	`{`
`60`		`- foreach (var reference in new[]`
	`60`	`+ foreach (PortableExecutableReference reference in new[]`
`61`	`61`	`{`
`62`	`62`	`MetadataReference.CreateFromFile(typeof(ControllerBase).Assembly.Location),`
`63`	`63`	`MetadataReference.CreateFromFile(typeof(AttrAttribute).Assembly.Location)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public string Build()`
`17`	`17`
`18`	`18`	`if (_namespaceImports.Any())`
`19`	`19`	`{`
`20`		`- foreach (var namespaceImport in _namespaceImports)`
	`20`	`+ foreach (string namespaceImport in _namespaceImports)`
`21`	`21`	`{`
`22`	`22`	`builder.AppendLine($"using {namespaceImport};");`
`23`	`23`	`}`