Put the method after the check

dotnet · Aug 27, 2024 · 23a72fb · 23a72fb
1 parent 73c2f85
commit 23a72fb
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/EditorFeatures/Core/InlineRename/InlineRenameSession.cs b/src/EditorFeatures/Core/InlineRename/InlineRenameSession.cs
@@ -761,13 +761,6 @@ public async Task CommitAsync(bool previewChanges, IUIThreadOperationContext edi
     private async Task<bool> CommitWorkerAsync(bool previewChanges, bool canUseBackgroundWorkIndicator, IUIThreadOperationContext editorUIOperationContext)
     {
         await _threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync();
-        if (editorUIOperationContext is not null)
-        {
-            // Prevent Editor's typing responsiveness auto canceling the rename operation.
-            // InlineRenameSession will call IUIThreadOperationExecutor to sets up our own IUIThreadOperationContext
-            editorUIOperationContext.TakeOwnership();
-        }
-
         VerifyNotDismissed();
 
         // If the identifier was deleted (or didn't change at all) then cancel the operation.
@@ -788,6 +781,13 @@ private async Task<bool> CommitWorkerAsync(bool previewChanges, bool canUseBackg
 
         previewChanges = previewChanges || PreviewChanges;
 
+        if (editorUIOperationContext is not null)
+        {
+            // Prevent Editor's typing responsiveness auto canceling the rename operation.
+            // InlineRenameSession will call IUIThreadOperationExecutor to sets up our own IUIThreadOperationContext
+            editorUIOperationContext.TakeOwnership();
+        }
+
         try
         {
             if (canUseBackgroundWorkIndicator)