Merge pull request #61379 from CyrusNajmabadi/renameSimplification

Minor simplification to rename code
dotnet · May 18, 2022 · f7b944d · f7b944d
2 parents 87fe251 + c591fcc
commit f7b944d
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/...ditorFeatures/Core/RenameTracking/RenameTrackingTaggerProvider.RenameTrackingCommitter.cs b/...ditorFeatures/Core/RenameTracking/RenameTrackingTaggerProvider.RenameTrackingCommitter.cs
@@ -53,15 +53,12 @@ public void Commit(CancellationToken cancellationToken)
             {
                 _stateMachine.ThreadingContext.ThrowIfNotOnUIThread();
 
-                var clearTrackingSession = ApplyChangesToWorkspace(cancellationToken);
+                ApplyChangesToWorkspace(cancellationToken);
 
                 // Clear the state machine so that future updates to the same token work,
                 // and any text changes caused by this update are not interpreted as 
                 // potential renames
-                if (clearTrackingSession)
-                {
-                    _stateMachine.ClearTrackingSession();
-                }
+                _stateMachine.ClearTrackingSession();
             }
 
             public async Task<RenameTrackingSolutionSet> RenameSymbolAsync(CancellationToken cancellationToken)
@@ -85,7 +82,7 @@ private async Task<RenameTrackingSolutionSet> RenameSymbolWorkerAsync(Cancellati
                 return new RenameTrackingSolutionSet(symbol, solutionWithOriginalName, renamedSolution);
             }
 
-            private bool ApplyChangesToWorkspace(CancellationToken cancellationToken)
+            private void ApplyChangesToWorkspace(CancellationToken cancellationToken)
             {
                 _stateMachine.ThreadingContext.ThrowIfNotOnUIThread();
 
@@ -140,7 +137,7 @@ private bool ApplyChangesToWorkspace(CancellationToken cancellationToken)
                         EditorFeaturesResources.Rename_Symbol,
                         NotificationSeverity.Error);
 
-                    return true;
+                    return;
                 }
 
                 // move all changes to final solution based on the workspace's current solution, since the current solution
@@ -165,7 +162,6 @@ private bool ApplyChangesToWorkspace(CancellationToken cancellationToken)
                     trackingSessionId);
 
                 RenameTrackingDismisser.DismissRenameTracking(workspace, changedDocuments);
-                return true;
             }
 
             private Solution CreateSolutionWithOriginalName(Document document, CancellationToken cancellationToken)