Skip to content

Fix regression in error list updates #64180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mavasani merged 1 commit into from
Sep 21, 2022
Merged

Fix regression in error list updates #64180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions ...ocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_GetDiagnosticsForSpan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ private sealed class LatestDiagnosticsForSpanGetter
private readonly Func<string, bool>? _shouldIncludeDiagnostic;
private readonly bool _includeCompilerDiagnostics;
private readonly Func<string, IDisposable?>? _addOperationScope;
private readonly bool _cacheFullDocumentDiagnostics;

private delegate Task<IEnumerable<DiagnosticData>> DiagnosticsGetterAsync(DiagnosticAnalyzer analyzer, DocumentAnalysisExecutor executor, CancellationToken cancellationToken);

Expand All @@ -96,11 +97,17 @@ public static async Task<LatestDiagnosticsForSpanGetter> CreateAsync(

var ideOptions = owner.AnalyzerService.GlobalOptions.GetIdeAnalyzerOptions(document.Project);

// We want to cache computed full document diagnostics in LatestDiagnosticsForSpanGetter
// only in LSP pull diagnostics mode. In LSP push diagnostics mode,
// the background analysis from solution crawler handles caching these diagnostics and
// updating the error list simultaneously.
var cacheFullDocumentDiagnostics = owner.AnalyzerService.GlobalOptions.IsPullDiagnostics(InternalDiagnosticsOptions.NormalDiagnosticMode);

var compilationWithAnalyzers = await GetOrCreateCompilationWithAnalyzersAsync(document.Project, ideOptions, stateSets, includeSuppressedDiagnostics, cancellationToken).ConfigureAwait(false);

return new LatestDiagnosticsForSpanGetter(
owner, compilationWithAnalyzers, document, text, stateSets, shouldIncludeDiagnostic, includeCompilerDiagnostics,
range, blockForData, addOperationScope, includeSuppressedDiagnostics, priority);
range, blockForData, addOperationScope, includeSuppressedDiagnostics, priority, cacheFullDocumentDiagnostics);
}

private static async Task<CompilationWithAnalyzers?> GetOrCreateCompilationWithAnalyzersAsync(
Expand Down Expand Up @@ -141,7 +148,8 @@ private LatestDiagnosticsForSpanGetter(
bool blockForData,
Func<string, IDisposable?>? addOperationScope,
bool includeSuppressedDiagnostics,
CodeActionRequestPriority priority)
CodeActionRequestPriority priority,
bool cacheFullDocumentDiagnostics)
{
_owner = owner;
_compilationWithAnalyzers = compilationWithAnalyzers;
Expand All @@ -155,6 +163,7 @@ private LatestDiagnosticsForSpanGetter(
_addOperationScope = addOperationScope;
_includeSuppressedDiagnostics = includeSuppressedDiagnostics;
_priority = priority;
_cacheFullDocumentDiagnostics = cacheFullDocumentDiagnostics;
}

public async Task<bool> TryGetAsync(ArrayBuilder<DiagnosticData> list, CancellationToken cancellationToken)
Expand Down Expand Up @@ -320,8 +329,8 @@ private async Task ComputeDocumentDiagnosticsAsync(
var diagnostics = diagnosticsMap[stateSet.Analyzer];
builder.AddRange(diagnostics.Where(ShouldInclude));

// Cache the computed diagnostics if they were computed for the entire document.
if (!span.HasValue)
// Save the computed diagnostics if caching is enabled and diagnostics were computed for the entire document.
if (_cacheFullDocumentDiagnostics && !span.HasValue)
{
var state = stateSet.GetOrCreateActiveFileState(_document.Id);
var data = new DocumentAnalysisData(version, diagnostics);
Expand Down