Add tests for comments and groups when moving out of a namespace

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/OrderingRules/UsingCodeFixProvider.UsingsSorter.cs

@@ -237,8 +237,19 @@ private List<UsingDirectiveSyntax> GenerateUsings(List<UsingDirectiveSyntax> usi
                             continue;
                         }
 
-                        triviaToMove.Insert(m, SyntaxFactory.Whitespace(indentation));
-                        m++;
+                        if (string.IsNullOrEmpty(indentation))
+                        {
+                            if (triviaToMove[m].IsKind(SyntaxKind.WhitespaceTrivia))
+                            {
+                                triviaToMove.RemoveAt(m);
+                                m--;
+                            }
+                        }
+                        else
+                        {
+                            triviaToMove.Insert(m, SyntaxFactory.Whitespace(indentation));
+                            m++;
+                        }
                     }
 
                     // strip any leading whitespace on each line (and also blank lines)

StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1200OutsideNamespaceUnitTests.cs

@@ -270,6 +270,46 @@ namespace TestNamespace
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task TestFileHeaderIsProperlyPreservedWhenMovingUsingStatementsWithCommentsAsync()
+        {
+            var testCode = @"// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+namespace TestNamespace
+{
+    // Separated Comment
+
+    using System.Collections;
+    // Comment
+    using System;
+}
+";
+            var fixedTestCode = @"// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+// Separated Comment
+
+// Comment
+using System;
+using System.Collections;
+
+namespace TestNamespace
+{
+}
+";
+
+            DiagnosticResult[] expectedResults =
+            {
+                this.CSharpDiagnostic(SA1200UsingDirectivesMustBePlacedCorrectly.DescriptorOutside).WithLocation(8, 5),
+                this.CSharpDiagnostic(SA1200UsingDirectivesMustBePlacedCorrectly.DescriptorOutside).WithLocation(10, 5),
+            };
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expectedResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override string GetSettings()
         {

StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderGroupSeparationUnitTests.cs

@@ -19,6 +19,7 @@ namespace StyleCop.Analyzers.Test.OrderingRules
     /// </summary>
     public class UsingCodeFixProviderGroupSeparationUnitTests : CodeFixVerifier
     {
+        private bool usingsInsideNamespace = true;
         private bool? systemUsingDirectivesFirst;
 
         /// <summary>
@@ -71,6 +72,53 @@ public class Bar
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task VerifyUsingReorderingOutsideNamespaceAsync()
+        {
+            this.systemUsingDirectivesFirst = true;
+
+            var testCode = @"namespace Foo
+{
+    using Microsoft.CodeAnalysis;
+    using SystemAction = System.Action;
+    using static System.Math;
+    using System;
+    using static System.String;
+    using MyFunc = System.Func<int,bool>;
+    using System.Collections.Generic;
+    using System.Collections;
+
+    public class Bar
+    {
+    }
+}
+";
+
+            var fixedTestCode = @"using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using Microsoft.CodeAnalysis;
+
+using static System.Math;
+using static System.String;
+
+using MyFunc = System.Func<int, bool>;
+using SystemAction = System.Action;
+
+namespace Foo
+{
+    public class Bar
+    {
+    }
+}
+";
+
+            this.usingsInsideNamespace = false;
+            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override string GetSettings()
         {
@@ -80,6 +128,7 @@ protected override string GetSettings()
 {{
     ""settings"": {{
         ""orderingRules"": {{
+            ""usingDirectivesPlacement"": ""{(this.usingsInsideNamespace ? "insideNamespace" : "outsideNamespace")}"",
             ""systemUsingDirectivesFirst"" : {systemUsingDirectivesFirst.ToString().ToLowerInvariant()},
             ""blankLinesBetweenUsingGroups"": ""require""
         }}