Skip to content

Cherrypick for 17.3: Fix potential deadlock if we are previewing a rename change #64159

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
Cosifne merged 1 commit into from
Sep 21, 2022
Merged

Cherrypick for 17.3: Fix potential deadlock if we are previewing a rename change #64159

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
2 changes: 2 additions & 0 deletions src/EditorFeatures/Core/InlineRename/InlineRenameSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,8 @@ private async Task CommitCoreAsync(IUIThreadOperationContext operationContext, b
{
var previewService = _workspace.Services.GetService<IPreviewDialogService>();

// The preview service needs to be called from the UI thread, since it's doing COM calls underneath.
await _threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
newSolution = previewService.PreviewChanges(
string.Format(EditorFeaturesResources.Preview_Changes_0, EditorFeaturesResources.Rename),
"vs.csharp.refactoring.rename",
Expand Down