Fix same-document editor conflict in multi-file partial class support

Copilot · Evangelink · Copilot · commit 97a39ad60412 · 2025-07-25T14:45:11.000Z
Co-authored-by: Evangelink &lt;11340282+Evangelink@users.noreply.github.com&gt;
diff --git a/src/Analyzers/MSTest.Analyzers.CodeFixes/PreferDisposeOverTestCleanupFixer.cs b/src/Analyzers/MSTest.Analyzers.CodeFixes/PreferDisposeOverTestCleanupFixer.cs
@@ -136,14 +136,24 @@ private static async Task<Solution> AddDisposeAndBaseClassAsync(
                 newDisposeMethod = existingDisposeMethod.WithBody(cleanupBody);
             }
 
-            // Update the dispose document
-            DocumentEditor disposeEditor = await DocumentEditor.CreateAsync(disposeDocument, cancellationToken).ConfigureAwait(false);
-            disposeEditor.ReplaceNode(existingDisposeMethod, newDisposeMethod);
-            solution = solution.WithDocumentSyntaxRoot(disposeDocument.Id, disposeEditor.GetChangedRoot());
-
-            // Remove the TestCleanup method from the current document
-            editor.RemoveNode(testCleanupMethod);
-            solution = solution.WithDocumentSyntaxRoot(document.Id, editor.GetChangedRoot());
+            if (disposeDocument.Id == document.Id)
+            {
+                // Both methods are in the same document, use single editor
+                editor.ReplaceNode(existingDisposeMethod, newDisposeMethod);
+                editor.RemoveNode(testCleanupMethod);
+                solution = solution.WithDocumentSyntaxRoot(document.Id, editor.GetChangedRoot());
+            }
+            else
+            {
+                // Methods are in different documents, use separate editors
+                DocumentEditor disposeEditor = await DocumentEditor.CreateAsync(disposeDocument, cancellationToken).ConfigureAwait(false);
+                disposeEditor.ReplaceNode(existingDisposeMethod, newDisposeMethod);
+                solution = solution.WithDocumentSyntaxRoot(disposeDocument.Id, disposeEditor.GetChangedRoot());
+
+                // Remove the TestCleanup method from the current document
+                editor.RemoveNode(testCleanupMethod);
+                solution = solution.WithDocumentSyntaxRoot(document.Id, editor.GetChangedRoot());
+            }
         }
         else
         {
