edits: fix conflicting edits in multi-replace-string #2016
Merged
+406
−33
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Minimize identical content in text edits to avoid potential conflicts in context - Explicitly error any edits that still fail rather than garbling the file Closes microsoft/vscode#277154
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a critical issue where the multi_replace_string_in_file tool could garble files when multiple replacements had overlapping ranges. The fix introduces two main improvements: (1) minimizing edits to preserve identical content between old and new strings, reducing the likelihood of conflicts, and (2) explicitly detecting and reporting conflicting edits rather than silently producing incorrect results.
Key changes:
- Edit minimization: All matching strategies now calculate and preserve identical leading/trailing content
- Conflict detection: New validation in
abstractReplaceStringTool.tsxdetects and errors on overlapping edits - Comprehensive test coverage: Extensive tests added for whitespace-flexible, similarity, and edit minimization strategies
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/extension/tools/node/editFileToolUtils.tsx |
Core implementation of edit minimization logic across all matching strategies; added helper functions getIdenticalLines and getIdenticalChars |
src/extension/tools/node/abstractReplaceStringTool.tsx |
Added conflict detection via _errorConflictingEdits method to validate edits don't overlap |
src/extension/tools/node/test/editFileToolUtils.spec.ts |
Added comprehensive test coverage for whitespace-flexible matching, similarity matching, and edit minimization |
src/extension/tools/node/test/multiReplaceStringTool.spec.tsx |
Changed test from skip to only; added validation for conflict error message |
Tyriar
previously approved these changes
Nov 14, 2025
connor4312
force-pushed
the
connor4312/multi-sr-conflicting
branch
from
0775251 to
0a783ba
Compare
Member
Author
|
Ended up fixing some other edge cases in this PR too, should help tidy up edits 💪 |
TylerLeonhardt
approved these changes
Nov 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes microsoft/vscode#277154