Skip to content

fix: Improve handling of escaped markers in apply_diff #2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrubens merged 4 commits into from
Apr 4, 2025
Merged

fix: Improve handling of escaped markers in apply_diff #2274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4af2786
fix: Improve handling of escaped markers in apply_diff
p12tic Apr 3, 2025
e256776
Merge remote-tracking branch 'origin/main' into fix-unescape-markers
mrubens Apr 4, 2025
c59ae2b
Revert test changes
mrubens Apr 4, 2025
63b29df
Add new test
mrubens Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/core/diff/strategies/__tests__/multi-search-replace.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,6 +1436,25 @@ function five() {
expect(result.success).toBe(true)
})

it("handles escaping of markers with custom suffixes", async () => {
const originalContent = "before\n<<<<<<< HEAD\nmiddle\n>>>>>>> feature-branch\nafter\n"
const diffContent =
"<<<<<<< SEARCH\n" +
"before\n" +
"\\<<<<<<< HEAD\n" +
"middle\n" +
"\\>>>>>>> feature-branch\n" +
"after\n" +
"=======\n" +
"replaced content\n" +
">>>>>>> REPLACE"
const result = await strategy.applyDiff(originalContent, diffContent)
expect(result.success).toBe(true)
if (result.success) {
expect(result.content).toBe("replaced content\n")
}
})

it("detects separator when expecting replace", () => {
const diff = "<<<<<<< SEARCH\n" + "content\n" + "=======\n" + "new content\n" + "======="
const result = strategy["validateMarkerSequencing"](diff)
Expand Down
4 changes: 2 additions & 2 deletions src/core/diff/strategies/multi-search-replace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ Only use a single line of '=======' between search and replacement content, beca

private unescapeMarkers(content: string): string {
return content
.replace(/^\\<<<<<<< SEARCH/gm, "<<<<<<< SEARCH")
.replace(/^\\<<<<<<</gm, "<<<<<<<")
.replace(/^\\=======/gm, "=======")
.replace(/^\\>>>>>>> REPLACE/gm, ">>>>>>> REPLACE")
.replace(/^\\>>>>>>>/gm, ">>>>>>>")
.replace(/^\\-------/gm, "-------")
.replace(/^\\:end_line:/gm, ":end_line:")
.replace(/^\\:start_line:/gm, ":start_line:")
Expand Down