Merge pull request #1735 from vweijsters/fix-1733

Fixed issue in UsingCodeFixProvider where a file header followed by …

Author: sharwell

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

@@ -154,7 +154,8 @@ private static SyntaxNode ReAddFileHeader(SyntaxNode syntaxRoot, SyntaxNode newS
             }
 
             var newFirstToken = newSyntaxRoot.GetFirstToken();
-            return newSyntaxRoot.ReplaceToken(newFirstToken, newFirstToken.WithLeadingTrivia(fileHeader));
+            var newLeadingTrivia = newFirstToken.LeadingTrivia.InsertRange(0, fileHeader);
+            return newSyntaxRoot.ReplaceToken(newFirstToken, newFirstToken.WithLeadingTrivia(newLeadingTrivia));
         }
 
         private static int CountNamespaces(SyntaxList<MemberDeclarationSyntax> members)

StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/UsingCodeFixProviderUnitTests.cs

@@ -477,6 +477,98 @@ public async Task VerifyCodefixForElsePartOfDirectiveTriviaAsync()
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verifies that the code fix will handle using statements with directive trivia outside of namespaces
+        /// This is a regression test for #1733
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task VerifyCodefixForDirectiveTriviaOutsideOfNamespacesAsync()
+        {
+            var testCode = @"// <copyright file=""Program.cs"" company=""PlaceholderCompany"" >
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+#if DEBUG
+using Fish;
+#else
+using Fish.Face;
+#endif
+using System.Text;
+using System;
+
+namespace StyleCopBugRepro
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Int32 q;
+            Haddock h;
+            StringBuilder sb;
+        }
+    }
+}
+
+namespace Fish
+{
+    public class Haddock { }
+
+    namespace Face
+    {
+        public class Haddock { }
+    }
+}
+";
+
+            var fixedTestCode = @"// <copyright file=""Program.cs"" company=""PlaceholderCompany"" >
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+#if DEBUG
+using Fish;
+#else
+using Fish.Face;
+#endif
+using System;
+using System.Text;
+
+namespace StyleCopBugRepro
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Int32 q;
+            Haddock h;
+            StringBuilder sb;
+        }
+    }
+}
+
+namespace Fish
+{
+    public class Haddock { }
+
+    namespace Face
+    {
+        public class Haddock { }
+    }
+}
+";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpDiagnostic(SA1200UsingDirectivesMustBePlacedWithinNamespace.DiagnosticId).WithLocation(8, 1),
+                this.CSharpDiagnostic(SA1200UsingDirectivesMustBePlacedWithinNamespace.DiagnosticId).WithLocation(10, 1),
+                this.CSharpDiagnostic(SA1210UsingDirectivesMustBeOrderedAlphabeticallyByNamespace.DiagnosticId).WithLocation(10, 1),
+                this.CSharpDiagnostic(SA1200UsingDirectivesMustBePlacedWithinNamespace.DiagnosticId).WithLocation(11, 1)
+            };
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override IEnumerable<string> GetDisabledDiagnostics()
         {