Skip to content
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

Remove unnecessary asynchrony from diagnostic computation. #77086

Merged
merged 3 commits into from
Feb 6, 2025
Merged

Remove unnecessary asynchrony from diagnostic computation. #77086

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59080e3
Make method synchronous
CyrusNajmabadi Feb 6, 2025
96d8242
Make method synchronous
CyrusNajmabadi Feb 6, 2025
36faae9
Merge remote-tracking branch 'upstream/main' into diagSynchronous
CyrusNajmabadi Feb 6, 2025
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
44 changes: 16 additions & 28 deletions ...rver/Protocol/Features/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.ProjectState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,14 @@ public async Task<DiagnosticAnalysisResult> GetAnalysisDataAsync(Project project
var lastResult = _lastResult;
Contract.ThrowIfFalse(lastResult.ProjectId == project.Id);

var version = await GetDiagnosticVersionAsync(project, cancellationToken).ConfigureAwait(false);
if (lastResult.IsDefault)
{
return await LoadInitialAnalysisDataAsync(project, cancellationToken).ConfigureAwait(false);
}
return LoadInitialAnalysisData(project, version, cancellationToken);

RoslynDebug.Assert(lastResult.DocumentIds != null);

// PERF: avoid loading data if version is not right one.
// avoid loading data flag is there as a strictly perf optimization.
var version = await GetDiagnosticVersionAsync(project, cancellationToken).ConfigureAwait(false);
if (lastResult.Version != version)
{
return lastResult;
Expand Down Expand Up @@ -110,12 +108,9 @@ public async Task<DiagnosticAnalysisResult> GetAnalysisDataAsync(TextDocument do
var lastResult = _lastResult;
Contract.ThrowIfFalse(lastResult.ProjectId == document.Project.Id);

if (lastResult.IsDefault)
{
return await LoadInitialAnalysisDataAsync(document, cancellationToken).ConfigureAwait(false);
}

var version = await GetDiagnosticVersionAsync(document.Project, cancellationToken).ConfigureAwait(false);
if (lastResult.IsDefault)
return LoadInitialAnalysisData(document, version);

// if given document doesnt have any diagnostics, return empty.
if (IsEmpty(lastResult, document.Id))
Expand Down Expand Up @@ -147,12 +142,10 @@ public async Task<DiagnosticAnalysisResult> GetProjectAnalysisDataAsync(Project
var lastResult = _lastResult;
Contract.ThrowIfFalse(lastResult.ProjectId == project.Id);

var version = await GetDiagnosticVersionAsync(project, cancellationToken).ConfigureAwait(false);
if (lastResult.IsDefault)
{
return await LoadInitialProjectAnalysisDataAsync(project, cancellationToken).ConfigureAwait(false);
}
return LoadInitialProjectAnalysisData(project, version);

var version = await GetDiagnosticVersionAsync(project, cancellationToken).ConfigureAwait(false);
if (avoidLoadingData && lastResult.Version != version)
{
return lastResult;
Expand Down Expand Up @@ -226,52 +219,47 @@ public async ValueTask SaveToInMemoryStorageAsync(Project project, DiagnosticAna
AddToInMemoryStorage(serializerVersion, new(result.ProjectId), NonLocalStateName, result.GetOtherDiagnostics());
}

private async Task<DiagnosticAnalysisResult> LoadInitialAnalysisDataAsync(Project project, CancellationToken cancellationToken)
private DiagnosticAnalysisResult LoadInitialAnalysisData(
Project project, VersionStamp version, CancellationToken cancellationToken)
{
// loading data can be canceled any time.
var version = await GetDiagnosticVersionAsync(project, cancellationToken).ConfigureAwait(false);
var serializerVersion = version;
var builder = new Builder(project, version);

foreach (var document in project.Documents)
{
cancellationToken.ThrowIfCancellationRequested();

if (!TryGetDiagnosticsFromInMemoryStorage(serializerVersion, document, builder))
if (!TryGetDiagnosticsFromInMemoryStorage(version, document, builder))
continue;
}

if (!TryGetProjectDiagnosticsFromInMemoryStorage(serializerVersion, project, builder))
if (!TryGetProjectDiagnosticsFromInMemoryStorage(version, project, builder))
return DiagnosticAnalysisResult.CreateEmpty(project.Id, VersionStamp.Default);

return builder.ToResult();
}

private async Task<DiagnosticAnalysisResult> LoadInitialAnalysisDataAsync(TextDocument document, CancellationToken cancellationToken)
private DiagnosticAnalysisResult LoadInitialAnalysisData(
TextDocument document, VersionStamp version)
{
// loading data can be canceled any time.
var project = document.Project;

var version = await GetDiagnosticVersionAsync(project, cancellationToken).ConfigureAwait(false);
var serializerVersion = version;
var builder = new Builder(project, version);

if (!TryGetDiagnosticsFromInMemoryStorage(serializerVersion, document, builder))
{
if (!TryGetDiagnosticsFromInMemoryStorage(version, document, builder))
return DiagnosticAnalysisResult.CreateEmpty(project.Id, VersionStamp.Default);
}

return builder.ToResult();
}

private async Task<DiagnosticAnalysisResult> LoadInitialProjectAnalysisDataAsync(Project project, CancellationToken cancellationToken)
private DiagnosticAnalysisResult LoadInitialProjectAnalysisData(
Project project, VersionStamp version)
{
// loading data can be canceled any time.
var version = await GetDiagnosticVersionAsync(project, cancellationToken).ConfigureAwait(false);
var serializerVersion = version;
var builder = new Builder(project, version);

if (!TryGetProjectDiagnosticsFromInMemoryStorage(serializerVersion, project, builder))
if (!TryGetProjectDiagnosticsFromInMemoryStorage(version, project, builder))
return DiagnosticAnalysisResult.CreateEmpty(project.Id, VersionStamp.Default);

return builder.ToResult();
Expand Down
Loading