Code cleanup (#2154)

Author: roji

.editorconfig

@@ -232,14 +232,6 @@ dotnet_naming_rule.const_field_naming.symbols = const_field_symbol
 dotnet_naming_rule.const_field_naming.style = pascal_case_style
 dotnet_naming_rule.const_field_naming.severity = suggestion
 
-# Private Fields
-dotnet_naming_symbols.private_field_symbol.applicable_kinds = field
-dotnet_naming_symbols.private_field_symbol.applicable_accessibilities = private
-
-dotnet_naming_rule.private_field_naming.symbols = private_field_symbol
-dotnet_naming_rule.private_field_naming.style = _camelCase
-dotnet_naming_rule.private_field_naming.severity = suggestion
-
 # Parameters
 dotnet_naming_symbols.parameter_symbol.applicable_kinds = parameter
 dotnet_naming_symbols.parameter_symbol.applicable_accessibilities = *

EFCore.PG.sln.DotSettings

@@ -175,7 +175,7 @@ SqlFunctionExpression Function(string name, SqlExpression[] arguments, Type retu
         SqlExpression OneBased(SqlExpression arg)
             => arg is SqlConstantExpression constant
                 ? _sqlExpressionFactory.Constant((int)constant.Value! + 1, constant.TypeMapping)
-                : (SqlExpression)_sqlExpressionFactory.Add(arg, _sqlExpressionFactory.Constant(1));
+                : _sqlExpressionFactory.Add(arg, _sqlExpressionFactory.Constant(1));
 
         RelationalTypeMapping ResultGeometryMapping()
         {

src/EFCore.PG.NTS/Query/ExpressionTranslators/Internal/NpgsqlNetTopologySuiteMethodCallTranslatorPlugin.cs

@@ -136,19 +136,19 @@ public static bool TryParseStoreTypeName(
             return true;
         }
 
-        if (subtypeName.EndsWith("ZM", StringComparison.Ordinal) && TryGetClrType(subtypeName[0..^2], out clrType))
+        if (subtypeName.EndsWith("ZM", StringComparison.Ordinal) && TryGetClrType(subtypeName[..^2], out clrType))
         {
             ordinates = Ordinates.XYZM;
             return true;
         }
 
-        if (subtypeName.EndsWith("M", StringComparison.Ordinal) && TryGetClrType(subtypeName[0..^1], out clrType))
+        if (subtypeName.EndsWith("M", StringComparison.Ordinal) && TryGetClrType(subtypeName[..^1], out clrType))
         {
             ordinates = Ordinates.XYM;
             return true;
         }
 
-        if (subtypeName.EndsWith("Z", StringComparison.Ordinal) && TryGetClrType(subtypeName[0..^1], out clrType))
+        if (subtypeName.EndsWith("Z", StringComparison.Ordinal) && TryGetClrType(subtypeName[..^1], out clrType))
         {
             ordinates = Ordinates.XYZ;
             return true;

src/EFCore.PG.NTS/Storage/Internal/NpgsqlNetTopologySuiteTypeMappingSourcePlugin.cs

@@ -42,8 +42,8 @@ public override Expression GenerateCodeLiteral(object value)
         var time = (LocalTime)value;
         return time.NanosecondOfSecond != 0
             ? ConstantCall(FromHourMinuteSecondNanosecondMethod, time.Hour, time.Minute, time.Second, (long)time.NanosecondOfSecond)
-            : (Expression)(time.Second != 0
+            : time.Second != 0
                 ? ConstantNew(ConstructorWithSeconds, time.Hour, time.Minute, time.Second)
-                : ConstantNew(ConstructorWithMinutes, time.Hour, time.Minute));
+                : ConstantNew(ConstructorWithMinutes, time.Hour, time.Minute);
     }
 }

src/EFCore.PG.NodaTime/Storage/Internal/TimeMapping.cs

@@ -313,7 +313,7 @@ private IReadOnlyList<MethodCallCodeFragment> GenerateIdentityOptions(IDictionar
                 identityOptions.IncrementBy == 1 ? null : (long?) identityOptions.IncrementBy,
                 identityOptions.MinValue,
                 identityOptions.MaxValue,
-                identityOptions.IsCyclic ? true : (bool?) null,
+                identityOptions.IsCyclic ? true : null,
                 identityOptions.NumbersToCache == 1 ? null : (long?) identityOptions.NumbersToCache)
         };
     }

src/EFCore.PG/Design/Internal/NpgsqlAnnotationCodeGenerator.cs

@@ -1,3 +1,4 @@
+// ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore.Diagnostics;
 
 /// <summary>

src/EFCore.PG/Diagnostics/NpgsqlEventId.cs

@@ -296,7 +296,7 @@ public static EntityTypeBuilder UseCockroachDbInterleaveInParent(
             throw new ArgumentException($"Entity not found in model for type: {parentEntity}", nameof(parentTableType));
         }
 
-        if (StoreObjectIdentifier.Create(parentEntity, StoreObjectType.Table) is not StoreObjectIdentifier tableIdentifier)
+        if (StoreObjectIdentifier.Create(parentEntity, StoreObjectType.Table) is not { } tableIdentifier)
         {
             throw new ArgumentException($"Entity {parentEntity.DisplayName()} is not mapped to a database table");
         }

src/EFCore.PG/Extensions/BuilderExtensions/NpgsqlEntityTypeBuilderExtensions.cs

@@ -284,7 +284,7 @@ public static ModelBuilder HasPostgresExtension(
     public static ModelBuilder HasPostgresExtension(
         this ModelBuilder modelBuilder,
         string name)
-        => modelBuilder.HasPostgresExtension(null, name, null);
+        => modelBuilder.HasPostgresExtension(null, name);
 
     #endregion
 

src/EFCore.PG/Extensions/BuilderExtensions/NpgsqlModelBuilderExtensions.cs

@@ -1,9 +1,9 @@
-
+using System.Diagnostics.CodeAnalysis;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore;
 
-[System.Diagnostics.CodeAnalysis.SuppressMessage("ReSharper", "UnusedParameter.Global")]
+[SuppressMessage("ReSharper", "UnusedParameter.Global")]
 public static class NpgsqlFullTextSearchDbFunctionsExtensions
 {
     /// <summary>