Enable a few whitespace enforcing IDE rules

.editorconfig

@@ -55,6 +55,11 @@ csharp_style_namespace_declarations = file_scoped
 # Brace settings
 csharp_prefer_braces = true # Prefer curly braces even for one line of code
 
+# Whitespace options
+csharp_style_allow_embedded_statements_on_same_line_experimental = false
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
+
 [*.{xml,config,*proj,nuspec,props,resx,targets,yml,tasks}]
 indent_size = 2
 
@@ -263,6 +268,18 @@ dotnet_diagnostic.IDE0161.severity = warning
 dotnet_style_allow_multiple_blank_lines_experimental = false
 dotnet_diagnostic.IDE2000.severity = warning
 
+# IDE2001: Embedded statements must be on their own line
+dotnet_diagnostic.IDE2001.severity = warning
+
+# IDE2002: Consecutive braces must not have blank line between them
+dotnet_diagnostic.IDE2002.severity = warning
+
+# IDE2003: Blank line required between block and subsequent statement
+dotnet_diagnostic.IDE2003.severity = warning
+
+# IDE2004: Blank line not allowed after constructor initializer colon
+dotnet_diagnostic.IDE2004.severity = warning
+
 [{eng/tools/**.cs,**/{test,testassets,samples,Samples,perf}/**.cs}]
 # CA1018: Mark attributes with AttributeUsageAttribute
 dotnet_diagnostic.CA1018.severity = suggestion
@@ -320,6 +337,8 @@ dotnet_diagnostic.IDE0059.severity = suggestion
 dotnet_diagnostic.IDE0060.severity = suggestion
 # IDE0062: Make local function static
 dotnet_diagnostic.IDE0062.severity = suggestion
+# IDE2001: Embedded statements must be on their own line
+dotnet_diagnostic.IDE2001.severity = suggestion
 
 # CA2016: Forward the 'CancellationToken' parameter to methods that take one
 dotnet_diagnostic.CA2016.severity = suggestion
@@ -339,6 +358,8 @@ dotnet_diagnostic.IDE0060.severity = silent
 dotnet_diagnostic.IDE0062.severity = silent
 # IDE0161: Convert to file-scoped namespace
 dotnet_diagnostic.IDE0161.severity = silent
+# IDE2001: Embedded statements must be on their own line
+dotnet_diagnostic.IDE2001.severity = silent
 
 [{**/Shared/**.cs,**/microsoft.extensions.hostfactoryresolver.sources/**.{cs,vb}}]
 # IDE0005: Remove unused usings. Ignore for shared src files since imports for those depend on the projects in which they are included.

src/Analyzers/Analyzers/src/OptionsAnalyzer.cs

@@ -32,7 +32,6 @@ operation.Target is IPropertyReferenceOperation property &&
             {
                 options.Add(new OptionsItem(property.Property, operation.Value.ConstantValue.Value));
             }
-
         }, OperationKind.SimpleAssignment);
 
         context.RegisterOperationBlockEndAction(context =>

src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs

@@ -155,7 +155,7 @@ void TryAddMapping(AzureADSchemeOptions o)
             {
                 JwtBearerScheme = jwtBearerScheme
             });
-        };
+        }
     }
 
     private static Action<AzureADSchemeOptions> TryAddOpenIDCookieSchemeMappings(string scheme, string openIdConnectScheme, string cookieScheme)
@@ -189,7 +189,7 @@ void TryAddMapping(AzureADSchemeOptions o)
                 OpenIdConnectScheme = openIdConnectScheme,
                 CookieScheme = cookieScheme
             });
-        };
+        }
     }
 
     private static void AddAdditionalMvcApplicationParts(IServiceCollection services)

src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs

@@ -152,7 +152,7 @@ void TryAddMapping(AzureADB2CSchemeOptions o)
             {
                 JwtBearerScheme = jwtBearerScheme
             });
-        };
+        }
     }
 
     private static Action<AzureADB2CSchemeOptions> TryAddOpenIDCookieSchemeMappings(string scheme, string openIdConnectScheme, string cookieScheme)
@@ -186,7 +186,7 @@ void TryAddMapping(AzureADB2CSchemeOptions o)
                 OpenIdConnectScheme = openIdConnectScheme,
                 CookieScheme = cookieScheme
             });
-        };
+        }
     }
 
     private static void AddAdditionalMvcApplicationParts(IServiceCollection services)

src/Components/Components/src/LayoutView.cs

@@ -70,7 +70,7 @@ void Render(RenderTreeBuilder builder)
             builder.OpenComponent(0, layoutType);
             builder.AddAttribute(1, LayoutComponentBase.BodyPropertyName, bodyParam);
             builder.CloseComponent();
-        };
+        }
 
         return Render;
     }

src/Components/Server/src/Circuits/CircuitHandleRegistry.cs

@@ -12,7 +12,7 @@ public CircuitHandle GetCircuitHandle(IDictionary<object, object?> circuitHandle
             return (CircuitHandle)circuitHandle;
         }
 
-        return null; ;
+        return null;
     }
 
     public CircuitHost GetCircuit(IDictionary<object, object?> circuitHandles, object circuitKey)

src/Components/Shared/src/TransmitDataStreamToJS.cs

@@ -51,5 +51,4 @@ internal static async Task TransmitStreamAsync(IJSRuntime runtime, long streamId
             }
         }
     }
-
 }

src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticatorCoreTests.cs

@@ -733,8 +733,8 @@ private class TestRemoteAuthenticationService : RemoteAuthenticationService<Remo
         public TestRemoteAuthenticationService(
             IJSRuntime jsRuntime,
             IOptionsSnapshot<RemoteAuthenticationOptions<OidcProviderOptions>> options,
-            TestNavigationManager navigationManager) :
-            base(jsRuntime, options, navigationManager, new AccountClaimsPrincipalFactory<RemoteUserAccount>(Mock.Of<IAccessTokenProviderAccessor>()))
+            TestNavigationManager navigationManager)
+            : base(jsRuntime, options, navigationManager, new AccountClaimsPrincipalFactory<RemoteUserAccount>(Mock.Of<IAccessTokenProviderAccessor>()))
         {
         }
 

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostConfiguration.cs

@@ -70,7 +70,6 @@ public string? this[string key]
             {
                 provider.Set(key, value);
             }
-
         }
     }
 

src/Components/WebView/WebView/src/Services/WebViewRenderer.cs

@@ -21,8 +21,8 @@ public WebViewRenderer(
         IpcSender ipcSender,
         ILoggerFactory loggerFactory,
         WebViewJSRuntime jsRuntime,
-        JSComponentInterop jsComponentInterop) :
-        base(serviceProvider, loggerFactory, jsRuntime.ReadJsonSerializerOptions(), jsComponentInterop)
+        JSComponentInterop jsComponentInterop)
+        : base(serviceProvider, loggerFactory, jsRuntime.ReadJsonSerializerOptions(), jsComponentInterop)
     {
         _dispatcher = dispatcher;
         _ipcSender = ipcSender;

src/Components/WebView/WebView/test/Infrastructure/TestDocument.cs

@@ -244,7 +244,6 @@ private int InsertFrame(RenderBatch batch, ContainerNode parent, int childIndex,
                     InsertMarkup(parent, childIndex, frame);
                     return 1;
                 }
-
         }
 
         throw new Exception($"Unknown frame type: {frame.FrameType}");

src/Components/test/E2ETest/Tests/WebAssemblyAuthenticationTests.cs

@@ -38,8 +38,8 @@ static WebAssemblyAuthenticationTests()
     public WebAssemblyAuthenticationTests(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
-        ITestOutputHelper output) :
-        base(browserFixture, serverFixture, output)
+        ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
     {
         _serverFixture.ApplicationAssembly = typeof(Program).Assembly;
 

src/Components/test/E2ETest/Tests/WebAssemblyConfigurationHostedTest.cs

@@ -17,8 +17,8 @@ public class WebAssemblyConfigurationHostedTest : ServerTestBase<BasicTestAppSer
     public WebAssemblyConfigurationHostedTest(
          BrowserFixture browserFixture,
          BasicTestAppServerSiteFixture<TestServer.ClientStartup> serverFixture,
-         ITestOutputHelper output) :
-         base(browserFixture, serverFixture, output)
+         ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
     {
     }
 

src/Components/test/E2ETest/Tests/WebAssemblyConfigurationTest.cs

@@ -17,8 +17,8 @@ public class WebAssemblyConfigurationTest : ServerTestBase<BlazorWasmTestAppFixt
     public WebAssemblyConfigurationTest(
          BrowserFixture browserFixture,
          BlazorWasmTestAppFixture<BasicTestApp.Program> serverFixture,
-         ITestOutputHelper output) :
-         base(browserFixture, serverFixture, output)
+         ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
     {
         _serverFixture.PathBase = "/subdir";
     }

src/Configuration.KeyPerFile/src/KeyPerFileConfigurationProvider.cs

@@ -36,7 +36,6 @@ public KeyPerFileConfigurationProvider(KeyPerFileConfigurationSource source)
                     Load(reload: true);
                 });
         }
-
     }
 
     private string NormalizeKey(string key)
@@ -98,7 +97,6 @@ private void Load(bool reload)
                 {
                     data.Add(NormalizeKey(file.Name), TrimNewLine(streamReader.ReadToEnd()));
                 }
-
             }
         }
 

src/DataProtection/DataProtection/src/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactory.cs

@@ -66,7 +66,7 @@ public CngCbcAuthenticatedEncryptorFactory(ILoggerFactory loggerFactory)
     private BCryptAlgorithmHandle GetHmacAlgorithmHandle(CngCbcAuthenticatedEncryptorConfiguration configuration)
     {
         // basic argument checking
-        if (String.IsNullOrEmpty(configuration.HashAlgorithm))
+        if (string.IsNullOrEmpty(configuration.HashAlgorithm))
         {
             throw Error.Common_PropertyCannotBeNullOrEmpty(nameof(configuration.HashAlgorithm));
         }
@@ -77,9 +77,13 @@ private BCryptAlgorithmHandle GetHmacAlgorithmHandle(CngCbcAuthenticatedEncrypto
         // Special-case cached providers
         if (configuration.HashAlgorithmProvider == null)
         {
-            if (configuration.HashAlgorithm == Constants.BCRYPT_SHA1_ALGORITHM) { algorithmHandle = CachedAlgorithmHandles.HMAC_SHA1; }
-            else if (configuration.HashAlgorithm == Constants.BCRYPT_SHA256_ALGORITHM) { algorithmHandle = CachedAlgorithmHandles.HMAC_SHA256; }
-            else if (configuration.HashAlgorithm == Constants.BCRYPT_SHA512_ALGORITHM) { algorithmHandle = CachedAlgorithmHandles.HMAC_SHA512; }
+            algorithmHandle = configuration.HashAlgorithm switch
+            {
+                Constants.BCRYPT_SHA1_ALGORITHM => CachedAlgorithmHandles.HMAC_SHA1,
+                Constants.BCRYPT_SHA256_ALGORITHM => CachedAlgorithmHandles.HMAC_SHA256,
+                Constants.BCRYPT_SHA512_ALGORITHM => CachedAlgorithmHandles.HMAC_SHA512,
+                _ => null,
+            };
         }
 
         // Look up the provider dynamically if we couldn't fetch a cached instance
@@ -100,7 +104,7 @@ private BCryptAlgorithmHandle GetHmacAlgorithmHandle(CngCbcAuthenticatedEncrypto
     private BCryptAlgorithmHandle GetSymmetricBlockCipherAlgorithmHandle(CngCbcAuthenticatedEncryptorConfiguration configuration)
     {
         // basic argument checking
-        if (String.IsNullOrEmpty(configuration.EncryptionAlgorithm))
+        if (string.IsNullOrEmpty(configuration.EncryptionAlgorithm))
         {
             throw Error.Common_PropertyCannotBeNullOrEmpty(nameof(EncryptionAlgorithm));
         }
@@ -116,7 +120,10 @@ private BCryptAlgorithmHandle GetSymmetricBlockCipherAlgorithmHandle(CngCbcAuthe
         // Special-case cached providers
         if (configuration.EncryptionAlgorithmProvider == null)
         {
-            if (configuration.EncryptionAlgorithm == Constants.BCRYPT_AES_ALGORITHM) { algorithmHandle = CachedAlgorithmHandles.AES_CBC; }
+            if (configuration.EncryptionAlgorithm == Constants.BCRYPT_AES_ALGORITHM)
+            {
+                algorithmHandle = CachedAlgorithmHandles.AES_CBC;
+            }
         }
 
         // Look up the provider dynamically if we couldn't fetch a cached instance

src/DataProtection/DataProtection/src/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactory.cs

@@ -82,7 +82,10 @@ private BCryptAlgorithmHandle GetSymmetricBlockCipherAlgorithmHandle(CngGcmAuthe
         // Special-case cached providers
         if (configuration.EncryptionAlgorithmProvider == null)
         {
-            if (configuration.EncryptionAlgorithm == Constants.BCRYPT_AES_ALGORITHM) { algorithmHandle = CachedAlgorithmHandles.AES_GCM; }
+            if (configuration.EncryptionAlgorithm == Constants.BCRYPT_AES_ALGORITHM)
+            {
+                algorithmHandle = CachedAlgorithmHandles.AES_GCM;
+            }
         }
 
         // Look up the provider dynamically if we couldn't fetch a cached instance

src/DataProtection/DataProtection/src/Secret.cs

@@ -148,7 +148,10 @@ private static SecureLocalAllocHandle Protect(byte* pbPlaintext, uint cbPlaintex
         {
             numBytesPaddingRequired = 0; // we're already a proper multiple of the block size
         }
-        checked { numTotalBytesToAllocate += numBytesPaddingRequired; }
+        checked
+        {
+            numTotalBytesToAllocate += numBytesPaddingRequired;
+        }
         CryptoUtil.Assert(numTotalBytesToAllocate % CRYPTPROTECTMEMORY_BLOCK_SIZE == 0, "numTotalBytesToAllocate % CRYPTPROTECTMEMORY_BLOCK_SIZE == 0");
 
         // Allocate and copy plaintext data; padding is uninitialized / undefined.

src/DataProtection/StackExchangeRedis/test/DataProtectionRedisTests.cs

@@ -103,6 +103,5 @@ public async Task XmlRoundTripsToActualRedisServer()
                 await redis.GetDatabase().KeyDeleteAsync(key);
             }
         }
-
     }
 }

src/Features/JsonPatch/src/Adapters/ObjectAdapter.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
@@ -18,8 +18,8 @@ public class ObjectAdapter : IObjectAdapterWithTest
     /// <param name="logErrorAction">The <see cref="Action"/> for logging <see cref="JsonPatchError"/>.</param>
     public ObjectAdapter(
         IContractResolver contractResolver,
-        Action<JsonPatchError> logErrorAction) :
-        this(contractResolver, logErrorAction, Adapters.AdapterFactory.Default)
+        Action<JsonPatchError> logErrorAction)
+        : this(contractResolver, logErrorAction, Adapters.AdapterFactory.Default)
     {
     }
 

src/FileProviders/Embedded/test/Manifest/TestEntry.cs

@@ -36,5 +36,4 @@ public IEnumerable<TestEntry> GetFiles()
 
         return files.Concat(otherFiles).ToArray();
     }
-
 }

src/Framework/AspNetCoreAnalyzers/src/Analyzers/WebApplicationBuilder/WebApplicationBuilderAnalyzer.cs

@@ -149,7 +149,6 @@ static Diagnostic CreateDiagnostic(DiagnosticDescriptor descriptor, IInvocationO
 
                     return Diagnostic.Create(descriptor, location);
                 }
-
             }, OperationKind.Invocation);
         });
     }

src/HealthChecks/HealthChecks/test/DefaultHealthCheckServiceTest.cs

@@ -689,7 +689,6 @@ public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, Canc
             {
                 return Task.FromResult(HealthCheckResult.Unhealthy("failed", e));
             }
-
         }
     }
 

src/Hosting/Hosting/src/Internal/HostingRequestStartingLog.cs

@@ -44,7 +44,7 @@ public override string ToString()
         if (_cachedToString == null)
         {
             var request = _request;
-            _cachedToString = $"{LogPreamble}{request.Protocol} {request.Method} {request.Scheme}://{request.Host.Value}{request.PathBase.Value}{request.Path.Value}{request.QueryString.Value} {EscapedValueOrEmptyMarker(request.ContentType)} {ValueOrEmptyMarker(request.ContentLength)}"; ;
+            _cachedToString = $"{LogPreamble}{request.Protocol} {request.Method} {request.Scheme}://{request.Host.Value}{request.PathBase.Value}{request.Path.Value}{request.QueryString.Value} {EscapedValueOrEmptyMarker(request.ContentType)} {ValueOrEmptyMarker(request.ContentLength)}";
         }
 
         return _cachedToString;

src/Hosting/Hosting/src/Internal/StartupLoader.cs

@@ -190,7 +190,7 @@ void InvokeStartup(IServiceCollection serviceCollection)
                             $"Use a void returning ConfigureServices method instead or a ConfigureContainer method.";
 #pragma warning restore CS0612 // Type or member is obsolete
                         throw new InvalidOperationException(message);
-                    };
+                    }
                 }
             }
         }

src/Hosting/TestHost/test/TestServerTests.cs

@@ -244,7 +244,6 @@ public void Configure(IApplicationBuilder app)
                 await context.Response.WriteAsync("ApplicationServicesEqual:" + (applicationServices == Services));
             });
         }
-
     }
 
     [Fact]

src/Http/Authentication.Core/test/AuthenticationServiceTests.cs

@@ -413,5 +413,4 @@ public Task SignOutAsync(AuthenticationProperties? properties)
             throw new NotImplementedException();
         }
     }
-
 }

src/Http/Authentication.Core/test/TokenExtensionTests.cs

@@ -190,5 +190,4 @@ public Task SignOutAsync(AuthenticationProperties properties)
             throw new NotImplementedException();
         }
     }
-
 }

src/Http/Http.Results/src/ConflictObjectResult.cs

@@ -5,8 +5,8 @@ namespace Microsoft.AspNetCore.Http.Result;
 
 internal sealed class ConflictObjectResult : ObjectResult
 {
-    public ConflictObjectResult(object? error) :
-        base(error, StatusCodes.Status409Conflict)
+    public ConflictObjectResult(object? error)
+        : base(error, StatusCodes.Status409Conflict)
     {
     }
 }

src/Http/Http.Results/test/FileStreamResultTest.cs

@@ -77,5 +77,4 @@ public void Constructor_SetsLastModifiedAndEtag()
         Assert.Equal(entityTag, result.EntityTag);
         Assert.Equal(expectedMediaType, result.ContentType);
     }
-
 }

src/Http/Http/test/BindingAddressTests.cs

@@ -106,5 +106,4 @@ public void UnixSocketUrlsAreParsedCorrectlyOnWindows(string url, string scheme,
 
         Assert.Equal(toString ?? url, serverAddress.ToString());
     }
-
 }

src/Http/Http/test/DefaultHttpContextTests.cs

@@ -336,7 +336,6 @@ void TestCachedFeaturesAreSet(object value, IFeatureCollection features)
                 Assert.NotNull(v);
             }
         }
-
     }
 
     private static void TestFeatureProperties(object value, IFeatureCollection features, IEnumerable<PropertyInfo> properties)