Skip to content

fix: enforce mandatory :start_line: in apply_diff tool #12200

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

Draft
roomote-v0 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: enforce mandatory :start_line: in apply_diff tool #12200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/core/diff/strategies/__tests__/multi-search-replace-trailing-newline.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ describe("MultiSearchReplaceDiffStrategy - trailing newline preservation", () =>
}
}`
const diffContent = `<<<<<<< SEARCH
:start_line:1
-------
1 | class Example {
2 | constructor() {
3 | this.value = 0;
Expand Down Expand Up @@ -43,6 +45,8 @@ class Example {
it("should handle Windows line endings with trailing newlines and line numbers", async () => {
const originalContent = "function test() {\r\n return true;\r\n}\r\n"
const diffContent = `<<<<<<< SEARCH
:start_line:1
-------
1 | function test() {
2 | return true;
3 | }
Expand All @@ -69,6 +73,8 @@ function two() {
return 2;
}`
const diffContent = `<<<<<<< SEARCH
:start_line:1
-------
1 | function one() {
2 | return 1;
3 | }
Expand All @@ -79,6 +85,8 @@ function one() {
>>>>>>> REPLACE

<<<<<<< SEARCH
:start_line:5
-------
5 | function two() {
6 | return 2;
7 | }
Expand Down Expand Up @@ -109,6 +117,8 @@ function two() {
+ CollectionUtils.size(personIdentityInfoList));`

const diffContent = `<<<<<<< SEARCH
:start_line:1
-------
1476 | List<ContactInfoItemResp> addressInfoList = new ArrayList<>(CollectionUtils.size(repairInfoList) > 10 ? 10
1477 | : CollectionUtils.size(repairInfoList) + CollectionUtils.size(homeAddressInfoList)
1478 | + CollectionUtils.size(idNoAddressInfoList) + CollectionUtils.size(workAddressInfoList)
Expand Down Expand Up @@ -143,6 +153,8 @@ function two() {
it("should correctly strip line numbers even when last line has no trailing newline", async () => {
const originalContent = "line 1\nline 2\nline 3" // No trailing newline
const diffContent = `<<<<<<< SEARCH
:start_line:1
-------
1 | line 1
2 | line 2
3 | line 3
Expand Down
Loading
Loading