Code cleanup: Phase 1 (#1785)

Tidying up for newer C# versions and removing old cruft:
- Removing unneeded pragmas (e.g. transitive obsoletes)
- Switch expressions
- Expression body usages, where it's cleaner with new switch expressions
- Statics where useful to remove virtual calls
- A handful of pattern matching usages where we were repeat casting
- `StringBuilder` optimizations for .NET Core (single char appends)
- Suppression fixes for contention between frameworks
- Suppression additions for dupe enum values (that are there for compat)
- Fix messages/arguments for many argument exceptions
- Re-enables the GC test (was the only skipped one - no longer needed)
- Misc compiler warning fixes
- Fixes KestrelRedisServer's conflict with `System.Runtime.CompilerServices.Unsafe`

These are broken up by commit for an easier review, but didn't want to make 12 PRs for some maintenance catch-up.

Note: this does not fix all informational message, including a few suspects for actual issues and some that are the way we structure `Dispose() => Dispose(true)` in a few files. Given those may change functionality, will do a follow-up PR there. This is meant to get all the noise gone and general cleanup without any significant impact anywhere.

Author: NickCraver

.editorconfig

@@ -48,6 +48,9 @@ dotnet_style_explicit_tuple_names = true:suggestion
 # Ignore silly if statements
 dotnet_style_prefer_conditional_expression_over_return = false:none
 
+# Don't warn on things that actually need suppressing
+dotnet_remove_unnecessary_suppression_exclusions = CA1009,CA1063,CA1069,CA1416,CA1816,CA1822,CA2202,CS0618,IDE0060,IDE0062,RCS1047,RCS1085,RCS1090,RCS1194,RCS1231
+
 # CSharp code style settings:
 [*.cs]
 # Prefer method-like constructs to have a expression-body
@@ -66,6 +69,11 @@ csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 csharp_style_inlined_variable_declaration = true:suggestion
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
+csharp_prefer_simple_using_statement = true:silent
+
+# Disable range operator suggestions
+csharp_style_prefer_range_operator = false:none
+csharp_style_prefer_index_operator = false:none
 
 # Newline settings
 csharp_new_line_before_open_brace = all

src/NRediSearch/Aggregation/AggregationRequest.cs

@@ -94,7 +94,7 @@ public AggregationRequest GroupBy(IList<string> fields, IList<Reducer> reducers)
             return this;
         }
 
-        public AggregationRequest GroupBy(String field, params Reducer[] reducers)
+        public AggregationRequest GroupBy(string field, params Reducer[] reducers)
         {
             return GroupBy(new string[] { field }, reducers);
         }

src/NRediSearch/Client.cs

@@ -134,7 +134,7 @@ public sealed class ConfiguredIndexOptions
             public static IndexOptions Default => new IndexOptions();
 
             private IndexOptions _options;
-            private IndexDefinition _definition;
+            private readonly IndexDefinition _definition;
             private string[] _stopwords;
 
             public ConfiguredIndexOptions(IndexOptions options = IndexOptions.Default)
@@ -1276,7 +1276,7 @@ public async Task<Document[]> GetDocumentsAsync(params string[] docIds)
         {
             if (docIds.Length == 0)
             {
-                return new Document[] { };
+                return Array.Empty<Document>();
             }
 
             var args = new List<object>

src/NRediSearch/Extensions.cs

@@ -23,16 +23,13 @@ internal static string AsRedisString(this double value, bool forceDecimal = fals
                 return value.ToString(forceDecimal ? "#.0" : "G17", NumberFormatInfo.InvariantInfo);
             }
         }
-        internal static string AsRedisString(this GeoUnit value)
+        internal static string AsRedisString(this GeoUnit value) => value switch
         {
-            switch (value)
-            {
-                case GeoUnit.Feet: return "ft";
-                case GeoUnit.Kilometers: return "km";
-                case GeoUnit.Meters: return "m";
-                case GeoUnit.Miles: return "mi";
-                default: throw new InvalidOperationException($"Unknown unit: {value}");
-            }
-        }
+            GeoUnit.Feet => "ft",
+            GeoUnit.Kilometers => "km",
+            GeoUnit.Meters => "m",
+            GeoUnit.Miles => "mi",
+            _ => throw new InvalidOperationException($"Unknown unit: {value}"),
+        };
     }
 }

src/NRediSearch/QueryBuilder/GeoValue.cs

@@ -21,11 +21,11 @@ public GeoValue(double lon, double lat, double radius, GeoUnit unit)
         public override string ToString()
         {
             return new StringBuilder("[")
-                    .Append(_lon.AsRedisString(true)).Append(" ")
-                    .Append(_lat.AsRedisString(true)).Append(" ")
-                    .Append(_radius.AsRedisString(true)).Append(" ")
+                    .Append(_lon.AsRedisString(true)).Append(' ')
+                    .Append(_lat.AsRedisString(true)).Append(' ')
+                    .Append(_radius.AsRedisString(true)).Append(' ')
                     .Append(_unit.AsRedisString())
-                    .Append("]").ToString();
+                    .Append(']').ToString();
         }
 
         public override bool IsCombinable() => false;

src/NRediSearch/QueryBuilder/QueryNode.cs

@@ -80,7 +80,7 @@ public virtual string ToString(ParenMode mode)
 
             if (ShouldUseParens(mode))
             {
-                sb.Append("(");
+                sb.Append('(');
             }
             var sj = new StringJoiner(sb, GetJoinString());
             foreach (var n in children)
@@ -89,7 +89,7 @@ public virtual string ToString(ParenMode mode)
             }
             if (ShouldUseParens(mode))
             {
-                sb.Append(")");
+                sb.Append(')');
             }
             return sb.ToString();
         }

src/NRediSearch/QueryBuilder/RangeValue.cs

@@ -15,19 +15,19 @@ private static void AppendNum(StringBuilder sb, double n, bool inclusive)
         {
             if (!inclusive)
             {
-                sb.Append("(");
+                sb.Append('(');
             }
             sb.Append(n.AsRedisString(true));
         }
 
         public override string ToString()
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append("[");
+            sb.Append('[');
             AppendNum(sb, from, inclusiveMin);
-            sb.Append(" ");
+            sb.Append(' ');
             AppendNum(sb, to, inclusiveMax);
-            sb.Append("]");
+            sb.Append(']');
             return sb.ToString();
         }
 

src/NRediSearch/QueryBuilder/ValueNode.cs

@@ -40,7 +40,7 @@ private string ToStringCombinable(ParenMode mode)
             StringBuilder sb = new StringBuilder(FormatField());
             if (_values.Length > 1 || mode == ParenMode.Always)
             {
-                sb.Append("(");
+                sb.Append('(');
             }
             var sj = new StringJoiner(sb, _joinString);
             foreach (var v in _values)
@@ -49,7 +49,7 @@ private string ToStringCombinable(ParenMode mode)
             }
             if (_values.Length > 1 || mode == ParenMode.Always)
             {
-                sb.Append(")");
+                sb.Append(')');
             }
             return sb.ToString();
         }
@@ -64,7 +64,7 @@ private string ToStringDefault(ParenMode mode)
             var sb = new StringBuilder();
             if (useParen)
             {
-                sb.Append("(");
+                sb.Append('(');
             }
             var sj = new StringJoiner(sb, _joinString);
             foreach (var v in _values)
@@ -73,7 +73,7 @@ private string ToStringDefault(ParenMode mode)
             }
             if (useParen)
             {
-                sb.Append(")");
+                sb.Append(')');
             }
             return sb.ToString();
         }

src/NRediSearch/Schema.cs

@@ -36,17 +36,14 @@ internal Field(string name, FieldType type, bool sortable, bool noIndex = false)
 
             internal virtual void SerializeRedisArgs(List<object> args)
             {
-                static object GetForRedis(FieldType type)
+                static object GetForRedis(FieldType type) => type switch
                 {
-                    switch (type)
-                    {
-                        case FieldType.FullText: return "TEXT".Literal();
-                        case FieldType.Geo: return "GEO".Literal();
-                        case FieldType.Numeric: return "NUMERIC".Literal();
-                        case FieldType.Tag: return "TAG".Literal();
-                        default: throw new ArgumentOutOfRangeException(nameof(type));
-                    }
-                }
+                    FieldType.FullText => "TEXT".Literal(),
+                    FieldType.Geo => "GEO".Literal(),
+                    FieldType.Numeric => "NUMERIC".Literal(),
+                    FieldType.Tag => "TAG".Literal(),
+                    _ => throw new ArgumentOutOfRangeException(nameof(type)),
+                };
                 args.Add(Name);
                 args.Add(GetForRedis(Type));
                 if (Sortable) { args.Add("SORTABLE".Literal()); }

src/NRediSearch/Suggestion.cs

@@ -91,6 +91,7 @@ public SuggestionBuilder Payload(string payload)
 
             public Suggestion Build() => Build(false);
 
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0071:Simplify interpolation", Justification = "Allocations (string.Concat vs. string.Format)")]
             internal Suggestion Build(bool fromServer)
             {
                 bool isStringMissing = _string == null;