Merge pull request #19426 from CyrusNajmabadi/blockSimplification

	Respect user settings around 'Blocks' when adding parameter null checks.

Author: CyrusNajmabadi

src/EditorFeatures/CSharpTest/InitializeParameter/AddParameterCheckTests.cs

@@ -755,5 +755,34 @@ static void Main(String bar)
             CodeStyleOptions.PreferIntrinsicPredefinedTypeKeywordInMemberAccess,
             CodeStyleOptions.FalseWithSuggestionEnforcement)));
         }
+
+        [WorkItem(19172, "https://github.com/dotnet/roslyn/issues/19172")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsInitializeParameter)]
+        public async Task TestPreferNoBlock()
+        {
+            await TestInRegularAndScript1Async(
+@"
+using System;
+
+class C
+{
+    public C([||]string s)
+    {
+    }
+}",
+@"
+using System;
+
+class C
+{
+    public C(string s)
+    {
+        if (s == null)
+            throw new ArgumentNullException(nameof(s));
+    }
+}", ignoreTrivia: false,
+    parameters: new TestParameters(options:
+        Option(CSharpCodeStyleOptions.PreferBraces, CodeStyleOptions.FalseWithNoneEnforcement)));
+        }
     }
 }

src/EditorFeatures/Test2/EditorServicesTest2.vbproj

@@ -249,6 +249,7 @@
     <Compile Include="IntelliSense\CompletionRulesTests.vb" />
     <Compile Include="LanguageServices\SyntaxFactsServiceTests.vb" />
     <Compile Include="NamingStyles\NamingStylesTests.vb" />
+    <Compile Include="Simplification\BlockSimplificationTests.vb" />
     <Compile Include="Simplification\SimplifierAPITests.vb" />
     <Compile Include="CodeFixes\CodeFixServiceTests.vb" />
     <Compile Include="Compilation\CompilationTests.vb" />