No need to pass callbacks

src/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.IncrementalMemberEditAnalyzer.cs

@@ -49,8 +49,6 @@ public async Task<ImmutableDictionary<DiagnosticAnalyzer, ImmutableArray<Diagnos
                 DocumentAnalysisExecutor executor,
                 ImmutableArray<DiagnosticAnalyzer> analyzers,
                 VersionStamp version,
-                Func<DiagnosticAnalyzer, DocumentAnalysisExecutor, CancellationToken, Task<ImmutableArray<DiagnosticData>>> computeAnalyzerDiagnosticsAsync,
-                Func<DocumentAnalysisExecutor, CancellationToken, Task<ImmutableDictionary<DiagnosticAnalyzer, ImmutableArray<DiagnosticData>>>> computeDiagnosticsNonIncrementallyAsync,
                 CancellationToken cancellationToken)
             {
                 var analysisScope = executor.AnalysisScope;
@@ -68,7 +66,7 @@ public async Task<ImmutableDictionary<DiagnosticAnalyzer, ImmutableArray<Diagnos
                 {
                     // This is not a member-edit scenario, so compute full document diagnostics
                     // without incremental analysis.
-                    return await computeDiagnosticsNonIncrementallyAsync(executor, cancellationToken).ConfigureAwait(false);
+                    return await ComputeDocumentDiagnosticsCoreAsync(executor, cancellationToken).ConfigureAwait(false);
                 }
 
                 var (changedMember, changedMemberId, newMemberSpans, oldDocument) = changedMemberAndIdAndSpansAndDocument.Value;
@@ -104,7 +102,7 @@ public async Task<ImmutableDictionary<DiagnosticAnalyzer, ImmutableArray<Diagnos
                     if (spanBasedAnalyzers.Count == 0 && (!compilerAnalyzerData.HasValue || !compilerAnalyzerData.Value.spanBased))
                     {
                         // No incremental span based-analysis to be performed.
-                        return await computeDiagnosticsNonIncrementallyAsync(executor, cancellationToken).ConfigureAwait(false);
+                        return await ComputeDocumentDiagnosticsCoreAsync(executor, cancellationToken).ConfigureAwait(false);
                     }
 
                     // Get or create the member spans for all member nodes in the old document.
@@ -177,7 +175,7 @@ async Task ExecuteAnalyzersAsync(
 
                     foreach (var analyzer in analyzers)
                     {
-                        var diagnostics = await computeAnalyzerDiagnosticsAsync(analyzer, executor, cancellationToken).ConfigureAwait(false);
+                        var diagnostics = await ComputeDocumentDiagnosticsForAnalyzerCoreAsync(analyzer, executor, cancellationToken).ConfigureAwait(false);
                         builder.Add(analyzer, diagnostics);
                     }
                 }

src/LanguageServer/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_GetDiagnosticsForSpan.cs

@@ -43,6 +43,31 @@ public async Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(
             return list.ToImmutableAndClear();
         }
 
+        private static async Task<ImmutableDictionary<DiagnosticAnalyzer, ImmutableArray<DiagnosticData>>> ComputeDocumentDiagnosticsCoreAsync(
+            DocumentAnalysisExecutor executor,
+            CancellationToken cancellationToken)
+        {
+            using var _ = PooledDictionary<DiagnosticAnalyzer, ImmutableArray<DiagnosticData>>.GetInstance(out var builder);
+            foreach (var analyzer in executor.AnalysisScope.ProjectAnalyzers.ConcatFast(executor.AnalysisScope.HostAnalyzers))
+            {
+                var diagnostics = await ComputeDocumentDiagnosticsForAnalyzerCoreAsync(analyzer, executor, cancellationToken).ConfigureAwait(false);
+                builder.Add(analyzer, diagnostics);
+            }
+
+            return builder.ToImmutableDictionary();
+        }
+
+        private static async Task<ImmutableArray<DiagnosticData>> ComputeDocumentDiagnosticsForAnalyzerCoreAsync(
+            DiagnosticAnalyzer analyzer,
+            DocumentAnalysisExecutor executor,
+            CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var diagnostics = await executor.ComputeDiagnosticsAsync(analyzer, cancellationToken).ConfigureAwait(false);
+            return diagnostics?.ToImmutableArrayOrEmpty() ?? [];
+        }
+
         /// <summary>
         /// Get diagnostics for given span either by using cache or calculating it on the spot.
         /// </summary>
@@ -291,8 +316,6 @@ private async Task ComputeDocumentDiagnosticsAsync(
                         executor,
                         analyzers,
                         version,
-                        ComputeDocumentDiagnosticsForAnalyzerCoreAsync,
-                        ComputeDocumentDiagnosticsCoreAsync,
                         cancellationToken).ConfigureAwait(false);
                 }
                 else
@@ -377,31 +400,6 @@ async Task<bool> IsCandidateForDeprioritizationBasedOnRegisteredActionsAsync(Dia
                 }
             }
 
-            private async Task<ImmutableDictionary<DiagnosticAnalyzer, ImmutableArray<DiagnosticData>>> ComputeDocumentDiagnosticsCoreAsync(
-                DocumentAnalysisExecutor executor,
-                CancellationToken cancellationToken)
-            {
-                using var _ = PooledDictionary<DiagnosticAnalyzer, ImmutableArray<DiagnosticData>>.GetInstance(out var builder);
-                foreach (var analyzer in executor.AnalysisScope.ProjectAnalyzers.ConcatFast(executor.AnalysisScope.HostAnalyzers))
-                {
-                    var diagnostics = await ComputeDocumentDiagnosticsForAnalyzerCoreAsync(analyzer, executor, cancellationToken).ConfigureAwait(false);
-                    builder.Add(analyzer, diagnostics);
-                }
-
-                return builder.ToImmutableDictionary();
-            }
-
-            private async Task<ImmutableArray<DiagnosticData>> ComputeDocumentDiagnosticsForAnalyzerCoreAsync(
-                DiagnosticAnalyzer analyzer,
-                DocumentAnalysisExecutor executor,
-                CancellationToken cancellationToken)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var diagnostics = await executor.ComputeDiagnosticsAsync(analyzer, cancellationToken).ConfigureAwait(false);
-                return diagnostics?.ToImmutableArrayOrEmpty() ?? [];
-            }
-
             private bool ShouldInclude(DiagnosticData diagnostic)
             {
                 return diagnostic.DocumentId == _document.Id &&