Merge pull request #64159 from Cosifne/dev/shech/cherrypickPreviewDea…

…dlock Cherrypick for 17.3: Fix potential deadlock if we are previewing a rename change
dotnet · Sep 21, 2022 · 80a8ce8 · 80a8ce8
2 parents 7d8de40 + a1db7de
commit 80a8ce8
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/EditorFeatures/Core/InlineRename/InlineRenameSession.cs b/src/EditorFeatures/Core/InlineRename/InlineRenameSession.cs
@@ -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",