Skip to content

Cleanup async token pattern in LSP #79063

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
merged 1 commit into from
Jun 19, 2025
Merged

Cleanup async token pattern in LSP #79063

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
13 changes: 6 additions & 7 deletions src/EditorFeatures/Core/LanguageServer/AlwaysActiveLanguageClientEventListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,21 @@ internal sealed class AlwaysActiveLanguageClientEventListener(
public void StartListening(Workspace workspace)
{
// Trigger a fire and forget request to the VS LSP client to load our ILanguageClient.
_ = LoadAsync();
Load();
}

public void StopListening(Workspace workspace)
{
// Nothing to do here. There's no concept of unloading an ILanguageClient.
}

private async Task LoadAsync()
private void Load()
{
try
using var token = _asynchronousOperationListener.BeginAsyncOperation(nameof(Load));
LoadAsync().ReportNonFatalErrorAsync().CompletesAsyncOperation(token);

async Task LoadAsync()
{
using var token = _asynchronousOperationListener.BeginAsyncOperation(nameof(LoadAsync));

// Explicitly switch to the bg so that if this causes any expensive work (like mef loads) it
// doesn't block the UI thread. Note, we always yield because sometimes our caller starts
Expand All @@ -67,9 +69,6 @@ await _languageClientBroker.Value.LoadAsync(new LanguageClientMetadata(
ContentTypeNames.FSharpContentType
]), _languageClient).ConfigureAwait(false);
}
catch (Exception e) when (FatalError.ReportAndCatch(e))
{
}
}

/// <summary>
Expand Down
Loading