Cleanup: spacing/access modifiers

.editorconfig

@@ -45,6 +45,9 @@ dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
 
+# Ignore silly if statements
+dotnet_style_prefer_conditional_expression_over_return = false:none
+
 # CSharp code style settings:
 [*.cs]
 # Prefer method-like constructs to have a expression-body
@@ -74,3 +77,6 @@ csharp_new_line_before_members_in_anonymous_types = true
 
 # Space settings
 csharp_space_after_keywords_in_control_flow_statements = true:suggestion
+
+# Language settings
+csharp_prefer_simple_default_expression = false:none
\ No newline at end of file

Shared.ruleset

 <?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="Rules for StackOverflow" Description="Code analysis rules for the StackOverflow solution." ToolsVersion="15.0">
   <IncludeAll Action="Warning" />
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
+    <Rule Id="IDE0045" Action="None" />
+    <Rule Id="IDE0046" Action="None" />
+  </Rules>
   <Rules AnalyzerId="Roslynator.CSharp.Analyzers" RuleNamespace="Roslynator.CSharp.Analyzers">
+    <Rule Id="RCS1047" Action="None" />
     <Rule Id="RCS1057" Action="None" />
+    <Rule Id="RCS1154" Action="None" />
   </Rules>
 </RuleSet>
\ No newline at end of file

StackExchange.Redis.StrongName/TypeForwarding.cs

 using System.Runtime.CompilerServices;
 
-
 [assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Aggregate))]
 [assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.Bitwise))]
 [assembly: TypeForwardedTo(typeof(global::StackExchange.Redis.ClientFlags))]

StackExchange.Redis.Tests/RawResultTests.cs

@@ -31,7 +31,6 @@ public void NullWorks()
         [Fact]
         public void DefaultWorks()
         {
-
             var result = default(RawResult);
             Assert.Equal(ResultType.None, result.Type);
             Assert.True(result.IsNull);
@@ -49,7 +48,6 @@ public void DefaultWorks()
         [Fact]
         public void NilWorks()
         {
-
             var result = RawResult.Nil;
             Assert.Equal(ResultType.None, result.Type);
             Assert.True(result.IsNull);

StackExchange.Redis.Tests/RedisValueEquivalency.cs

@@ -143,12 +143,12 @@ void Check(RedisValue known, RedisValue test)
             CheckString(double.PositiveInfinity, "+inf");
         }
 
-        static void CheckString(RedisValue value, string expected)
+        private static void CheckString(RedisValue value, string expected)
         {
             var s = value.ToString();
             Assert.True(s == expected, $"'{s}' vs '{expected}'");
         }
 
-        static byte[] Bytes(string s) => s == null ? null : Encoding.UTF8.GetBytes(s);
+        private static byte[] Bytes(string s) => s == null ? null : Encoding.UTF8.GetBytes(s);
     }
 }

StackExchange.Redis/StackExchange/Redis/Format.cs

@@ -183,7 +183,7 @@ internal static unsafe string DecodeUtf8(ReadOnlySpan<byte> s)
                 return Encoding.UTF8.GetString(ptr, s.Length);
             }
         }
-        static bool CaseInsensitiveASCIIEqual(string xLowerCase, ReadOnlySpan<byte> y)
+        private static bool CaseInsensitiveASCIIEqual(string xLowerCase, ReadOnlySpan<byte> y)
         {
             if (y.Length != xLowerCase.Length) return false;
             for(int i = 0; i < y.Length; i++)

StackExchange.Redis/StackExchange/Redis/PhysicalBridge.cs

@@ -119,7 +119,7 @@ public WriteResult TryWrite(Message message, bool isSlave)
                     // you can go in the queue, but we won't be starting
                     // a worker, because the handshake has not completed
                     var queue = _preconnectBacklog;
-                    lock(queue)
+                    lock (queue)
                     {
                         queue.Enqueue(message);
                     }
@@ -136,7 +136,6 @@ public WriteResult TryWrite(Message message, bool isSlave)
             var physical = this.physical;
             if (physical == null) return WriteResult.NoConnectionAvailable;
 
-
             var result = WriteMessageDirect(physical, message);
             LogNonPreferred(message.Flags, isSlave);
 
@@ -182,10 +181,11 @@ internal int GetOutstandingCount(out int inst, out int qs, out int qc, out int @
         {// defined as: PendingUnsentItems + SentItemsAwaitingResponse + ResponsesAwaitingAsyncCompletion
             inst = (int)(Interlocked.Read(ref operationCount) - Interlocked.Read(ref profileLastLog));
             var tmp = physical;
-            if(tmp == null)
+            if (tmp == null)
             {
                 qs = @in = 0;
-            } else
+            }
+            else
             {
                 qs = tmp.GetSentAwaitingResponseCount();
                 @in = tmp.GetAvailableInboundBytes();
@@ -257,7 +257,8 @@ internal async Task OnConnectedAsync(PhysicalConnection connection, TextWriter l
                 try
                 {
                     connection.Dispose();
-                } catch { }
+                }
+                catch { }
             }
         }
 
@@ -311,24 +312,24 @@ internal void OnDisconnected(ConnectionFailureType failureType, PhysicalConnecti
 
         private Message DequeueNextPendingBacklog()
         {
-            lock(_preconnectBacklog)
+            lock (_preconnectBacklog)
             {
                 return _preconnectBacklog.Count == 0 ? null : _preconnectBacklog.Dequeue();
             }
         }
-        void WritePendingBacklog(PhysicalConnection connection)
+        private void WritePendingBacklog(PhysicalConnection connection)
         {
-            if(connection != null)
+            if (connection != null)
             {
                 Message next;
                 do
                 {
                     next = DequeueNextPendingBacklog();
-                    if(next != null) WriteMessageDirect(connection, next);
+                    if (next != null) WriteMessageDirect(connection, next);
                 } while (next != null);
             }
         }
-        void AbandonPendingBacklog(Exception ex)
+        private void AbandonPendingBacklog(Exception ex)
         {
             Message next;
             do
@@ -394,7 +395,7 @@ internal void OnHeartbeat(bool ifConnectedOnly)
                         var tmp = physical;
                         if (tmp != null)
                         {
-                            if(state == (int)State.ConnectedEstablished)
+                            if (state == (int)State.ConnectedEstablished)
                             {
                                 Interlocked.Exchange(ref connectTimeoutRetryCount, 0);
                                 tmp.Bridge.ServerEndPoint.ClearUnselectable(UnselectableFlags.DidNotRespond);
@@ -403,7 +404,7 @@ internal void OnHeartbeat(bool ifConnectedOnly)
                             int writeEverySeconds = ServerEndPoint.WriteEverySeconds,
                                 checkConfigSeconds = Multiplexer.RawConfig.ConfigCheckSeconds;
 
-                            if(state == (int)State.ConnectedEstablished && ConnectionType == ConnectionType.Interactive
+                            if (state == (int)State.ConnectedEstablished && ConnectionType == ConnectionType.Interactive
                                 && checkConfigSeconds > 0 && ServerEndPoint.LastInfoReplicationCheckSecondsAgo >= checkConfigSeconds
                                 && ServerEndPoint.CheckInfoReplication())
                             {
@@ -549,7 +550,7 @@ internal WriteResult WriteMessageDirect(PhysicalConnection physical, Message nex
             }
             finally
             {
-                if(haveLock) Monitor.Exit(WriteLock);
+                if (haveLock) Monitor.Exit(WriteLock);
             }
 
             return result;
@@ -710,7 +711,7 @@ private WriteResult WriteMessageToServer(PhysicalConnection connection, Message
                 {
                     case RedisCommand.EVAL:
                     case RedisCommand.EVALSHA:
-                        if(!ServerEndPoint.GetFeatures().ScriptingDatabaseSafe)
+                        if (!ServerEndPoint.GetFeatures().ScriptingDatabaseSafe)
                         {
                             connection.SetUnknownDatabase();
                         }

StackExchange.Redis/StackExchange/Redis/PhysicalConnection.cs

@@ -467,7 +467,6 @@ internal void WriteHeader(string command, int arguments)
 
         private void WriteHeader(byte[] commandBytes, int arguments)
         {
-
             // remember the time of the first write that still not followed by read
             Interlocked.CompareExchange(ref firstUnansweredWriteTickCount, Environment.TickCount, 0);
 

StackExchange.Redis/StackExchange/Redis/RawResult.cs

@@ -9,7 +9,6 @@ namespace StackExchange.Redis
         internal static readonly RawResult NullMultiBulk = new RawResult(null, 0);
         internal static readonly RawResult EmptyMultiBulk = new RawResult(Array.Empty<RawResult>(), 0);
         internal static readonly RawResult Nil = default;
-        
 
         private readonly ReadOnlySequence<byte> _payload;
         // note: can't use Memory<RawResult> here - struct recursion breaks runtimr
@@ -17,7 +16,7 @@ namespace StackExchange.Redis
         private readonly int _itemsCount;
         private readonly ResultType _type;
 
-        const ResultType NonNullFlag = (ResultType)128;
+        private const ResultType NonNullFlag = (ResultType)128;
 
         public RawResult(ResultType resultType, ReadOnlySequence<byte> payload, bool isNull)
         {
@@ -84,7 +83,6 @@ internal RedisChannel AsRedisChannel(byte[] channelPrefix, RedisChannel.PatternM
                     }
                     if (AssertStarts(channelPrefix))
                     {
-
                         byte[] copy = _payload.Slice(channelPrefix.Length).ToArray();
                         return new RedisChannel(copy, mode);
                     }
@@ -133,7 +131,7 @@ public void Recycle(int limit = -1)
                     arr[i].Recycle();
                 }
                 ArrayPool<RawResult>.Shared.Return(arr, clearArray: false);
-            }   
+            }
         }
 
         internal unsafe bool IsEqual(byte[] expected)
@@ -341,7 +339,7 @@ internal unsafe string GetString()
                     charCount += decoder.GetCharCount(bPtr, span.Length, false);
                 }
             }
-            
+
             decoder.Reset();
 
             string s = new string((char)0, charCount);

StackExchange.Redis/StackExchange/Redis/RedisValue.cs

@@ -146,7 +146,7 @@ public override bool Equals(object obj)
         /// See Object.GetHashCode()
         /// </summary>
         public override int GetHashCode() => GetHashCode(this);
-        static int GetHashCode(RedisValue x)
+        private static int GetHashCode(RedisValue x)
         {
             x = x.Simplify();
             switch (x.Type)
@@ -309,7 +309,7 @@ internal StorageType Type
         /// <param name="other">The other <see cref="RedisValue"/> to compare.</param>
         public int CompareTo(RedisValue other) => CompareTo(this, other);
 
-        static int CompareTo(RedisValue x, RedisValue y)
+        private static int CompareTo(RedisValue x, RedisValue y)
         {
             try
             {
@@ -345,7 +345,6 @@ static int CompareTo(RedisValue x, RedisValue y)
                         break;
                 }
 
-
                 // otherwise, compare as strings
                 return string.CompareOrdinal((string)x, (string)y);
             }
@@ -455,8 +454,6 @@ internal static RedisValue TryParse(object obj)
             return new RedisValue(0, default, value);
         }
 
-
-
         /// <summary>
         /// Creates a new <see cref="RedisValue"/> from an <see cref="T:byte[]"/>.
         /// </summary>
@@ -605,7 +602,7 @@ private static bool TryParseDouble(ReadOnlySpan<byte> blob, out double value)
                     throw new InvalidOperationException();
             }
         }
-        static string ToHex(ReadOnlySpan<byte> src)
+        private static string ToHex(ReadOnlySpan<byte> src)
         {
             const string HexValues = "0123456789ABCDEF";
 
@@ -742,7 +739,6 @@ private RedisValue Simplify()
                     if (f64 >= long.MinValue && f64 <= long.MaxValue
                         && (i64 = (long)f64) == f64) return i64;
                     break;
-
             }
             return this;
         }

StackExchange.Redis/StackExchange/Redis/ResultProcessor.cs

@@ -395,7 +395,6 @@ internal static bool IsSHA1(string script)
                 return script != null && sha1.IsMatch(script);
             }
 
-
             internal const int Sha1HashLength = 20;
             internal static byte[] ParseSHA1(byte[] value)
             {

StackExchange.Redis/StackExchange/Redis/ServerEndPoint.cs

@@ -466,7 +466,7 @@ internal Task OnEstablishingAsync(PhysicalConnection connection, TextWriter log)
             }
             return Task.CompletedTask;
         }
-        async Task OnEstablishingAsyncAwaited(PhysicalConnection connection, Task handshake)
+        private async Task OnEstablishingAsyncAwaited(PhysicalConnection connection, Task handshake)
         {
             try
             {