Merge branch 'master' into update-build-tools5

OmniSharp · Jan 25, 2022 · 098f60f · 098f60f
2 parents 802cf07 + d10ba5b
commit 098f60f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Workers/Diagnostics/CSharpDiagnosticWorker.cs b/src/OmniSharp.Roslyn.CSharp/Workers/Diagnostics/CSharpDiagnosticWorker.cs
@@ -141,7 +141,7 @@ public async Task<ImmutableArray<DocumentDiagnostics>> GetDiagnostics(ImmutableA
         {
             if (!documentPaths.Any()) return ImmutableArray<DocumentDiagnostics>.Empty;
 
-            var results = new List<DocumentDiagnostics>();
+            var results = ImmutableList<DocumentDiagnostics>.Empty;
 
             var documents =
                 (await Task.WhenAll(
@@ -164,7 +164,8 @@ public async Task<ImmutableArray<DocumentDiagnostics>> GetDiagnostics(ImmutableA
                             try
                             {
                                 var diagnostics = await GetDiagnosticsForDocument(document, projectName);
-                                results.Add(new DocumentDiagnostics(document.Id, document.FilePath, document.Project.Id, document.Project.Name, diagnostics));
+                                var documentDiagnostics = new DocumentDiagnostics(document.Id, document.FilePath, document.Project.Id, document.Project.Name, diagnostics);
+                                ImmutableInterlocked.Update(ref results, currentResults => currentResults.Add(documentDiagnostics));
                             }
                             finally
                             {