Merge pull request #436 from JakenVeina/master

Visual Studio Project Template: "Analyzer with Code Fix": Verifier does not properly account for multiple source files
dotnet · Feb 4, 2020 · f2afcfa · f2afcfa
2 parents ae4c535 + 01fc349
commit f2afcfa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...oslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/DiagnosticVerifier.Helper.cs b/...oslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/DiagnosticVerifier.Helper.cs
@@ -1,4 +1,4 @@
-using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Text;
@@ -92,7 +92,10 @@ protected static Diagnostic[] GetSortedDiagnosticsFromDocuments(DiagnosticAnalyz
         /// <returns>An IEnumerable containing the Diagnostics in order of Location</returns>
         private static Diagnostic[] SortDiagnostics(IEnumerable<Diagnostic> diagnostics)
         {
-            return diagnostics.OrderBy(d => d.Location.SourceSpan.Start).ToArray();
+            return diagnostics
+                .OrderBy(d => d.Location.SourceTree.FilePath)
+                .ThenBy(d => d.Location.SourceSpan.Start)
+                .ToArray();
         }
 
         #endregion