Skip to content

Commit 086e0db

Browse files
committed
Enhance diff processor with robust hunk matching and additional test cases
- what test cases are missing? - add missing test cases - find dead code and remove it, together with comments ├── apps │ └── editor │ └── src │ └── utils │ └── changes-integration │ └── diff-processor │ ├── diff-processor.spec.ts │ ├── diff-processor.ts │ ├── index.ts │ ├── test-cases │ │ ├── adjacent-hunks │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── delete-all-lines │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── deletion-only │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── empty-file │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── empty-file-2 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── failing │ │ │ ├── diff.txt │ │ │ └── original.txt │ │ ├── failing-2 │ │ │ ├── diff.txt │ │ │ └── original.txt │ │ ├── failing-partial-duplicate │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── failing-partial-hunk │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── failing-stale-deletion │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-1 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-2 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-3 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-4 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-5 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-6 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-7 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-8 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── generic-9 │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── indent-shift │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── insert-middle │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── insert-start-end │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── loose-gap-match │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── multiple-hunks │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── no-trailing-newline │ │ │ └── diff.txt │ │ ├── out-of-order-hunks │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ ├── redundant-new-empty-line │ │ │ ├── diff.txt │ │ │ ├── expected.txt │ │ │ └── original.txt │ │ └── same-line-replace │ │ ├── diff.txt │ │ ├── expected.txt │ │ └── original.txt │ ├── types.ts │ └── utils │ ├── apply-blocks.ts │ ├── empty-file-handler.ts │ ├── match-blocks.ts │ ├── normalize.ts │ └── parse-blocks.ts └── file.ts
1 parent 4e14825 commit 086e0db

30 files changed

Lines changed: 493 additions & 124 deletions

File tree

‎apps/editor/src/utils/changes-integration/diff-processor/diff-processor.spec.ts‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,5 +277,114 @@ describe('diff-processor', () => {
277277

278278
expect(result).toBe(expected)
279279
})
280+
281+
it('applies diff with out-of-order hunks correctly', async () => {
282+
const test_case = 'out-of-order-hunks'
283+
const original = load_test_case_file('', test_case, 'original.txt')
284+
const diff = load_test_case_file('', test_case, 'diff.txt')
285+
const expected = load_test_case_file('', test_case, 'expected.txt')
286+
287+
const result = apply_diff({
288+
original_code: original,
289+
diff_patch: diff
290+
})
291+
292+
expect(result).toBe(expected)
293+
})
294+
295+
it('applies diff with adjacent hunks correctly', async () => {
296+
const test_case = 'adjacent-hunks'
297+
const original = load_test_case_file('', test_case, 'original.txt')
298+
const diff = load_test_case_file('', test_case, 'diff.txt')
299+
const expected = load_test_case_file('', test_case, 'expected.txt')
300+
301+
const result = apply_diff({
302+
original_code: original,
303+
diff_patch: diff
304+
})
305+
306+
expect(result).toBe(expected)
307+
})
308+
309+
it('applies diff with insertion in the middle of file correctly', async () => {
310+
const test_case = 'insert-middle'
311+
const original = load_test_case_file('', test_case, 'original.txt')
312+
const diff = load_test_case_file('', test_case, 'diff.txt')
313+
const expected = load_test_case_file('', test_case, 'expected.txt')
314+
315+
const result = apply_diff({
316+
original_code: original,
317+
diff_patch: diff
318+
})
319+
320+
expect(result).toBe(expected)
321+
})
322+
323+
it('applies diff deleting all lines correctly', async () => {
324+
const test_case = 'delete-all-lines'
325+
const original = load_test_case_file('', test_case, 'original.txt')
326+
const diff = load_test_case_file('', test_case, 'diff.txt')
327+
const expected = load_test_case_file('', test_case, 'expected.txt')
328+
329+
const result = apply_diff({
330+
original_code: original,
331+
diff_patch: diff
332+
})
333+
334+
expect(result).toBe(expected)
335+
})
336+
337+
it('applies diff with indent shift correctly', async () => {
338+
const test_case = 'indent-shift'
339+
const original = load_test_case_file('', test_case, 'original.txt')
340+
const diff = load_test_case_file('', test_case, 'diff.txt')
341+
const expected = load_test_case_file('', test_case, 'expected.txt')
342+
343+
const result = apply_diff({
344+
original_code: original,
345+
diff_patch: diff
346+
})
347+
348+
expect(result).toBe(expected)
349+
})
350+
351+
it('throws when a partial hunk fails to apply', async () => {
352+
const test_case = 'failing-partial-hunk'
353+
const original = load_test_case_file('', test_case, 'original.txt')
354+
const diff = load_test_case_file('', test_case, 'diff.txt')
355+
356+
expect(() => {
357+
apply_diff({
358+
original_code: original,
359+
diff_patch: diff
360+
})
361+
}).toThrow(/Failed to apply \d+ hunk\(s\)/)
362+
})
363+
364+
it('throws when a stale deletion hunk fails to apply', async () => {
365+
const test_case = 'failing-stale-deletion'
366+
const original = load_test_case_file('', test_case, 'original.txt')
367+
const diff = load_test_case_file('', test_case, 'diff.txt')
368+
369+
expect(() => {
370+
apply_diff({
371+
original_code: original,
372+
diff_patch: diff
373+
})
374+
}).toThrow(/Failed to apply \d+ hunk\(s\)/)
375+
})
376+
377+
it('throws when a partial duplicate hunk fails to apply', async () => {
378+
const test_case = 'failing-partial-duplicate'
379+
const original = load_test_case_file('', test_case, 'original.txt')
380+
const diff = load_test_case_file('', test_case, 'diff.txt')
381+
382+
expect(() => {
383+
apply_diff({
384+
original_code: original,
385+
diff_patch: diff
386+
})
387+
}).toThrow(/Failed to apply \d+ hunk\(s\)/)
388+
})
280389
})
281390
})

‎apps/editor/src/utils/changes-integration/diff-processor/diff-processor.ts‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ export const apply_diff = (params: {
4545

4646
match_blocks({
4747
search_replace_blocks,
48-
original_code_lines_normalized
48+
original_code_lines_normalized,
49+
use_strict_whitespace: params.use_strict_whitespace
4950
})
5051

5152
const invalid_blocks = search_replace_blocks.filter(
@@ -58,15 +59,18 @@ export const apply_diff = (params: {
5859
)
5960
}
6061

61-
const valid_blocks = search_replace_blocks
62-
valid_blocks.sort(
62+
search_replace_blocks.sort(
6363
(a, b) => b.search_block_start_index - a.search_block_start_index
6464
)
6565

66-
return restore_eol(
67-
apply_blocks({
68-
valid_blocks,
69-
original_code_lines
70-
})
71-
)
66+
let result = apply_blocks({
67+
valid_blocks: search_replace_blocks,
68+
original_code_lines
69+
})
70+
71+
if (result === '' && original_code_normalized.endsWith('\n')) {
72+
result = '\n'
73+
}
74+
75+
return restore_eol(result)
7276
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- a/file.ts
2+
+++ b/file.ts
3+
@@ -1,3 +1,3 @@
4+
-const a = 1
5+
+const a = 10
6+
const b = 2
7+
const c = 3
8+
@@ -2,3 +2,3 @@
9+
const b = 2
10+
const c = 3
11+
-const d = 4
12+
+const d = 40
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const a = 10
2+
const b = 2
3+
const c = 3
4+
const d = 40
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const a = 1
2+
const b = 2
3+
const c = 3
4+
const d = 4
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
--- a/file.ts
2+
+++ b/file.ts
3+
@@ -1,3 +0,0 @@
4+
-const a = 1
5+
-const b = 2
6+
-const c = 3
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
const a = 1
2+
const b = 2
3+
const c = 3
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--- a/file.ts
2+
+++ b/file.ts
3+
@@ -1,4 +1,6 @@
4+
import { a } from './a'
5+
+import { b } from './b'
6+
+import { c } from './c'
7+
8+
export const sum = a + b
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { a } from './a'
2+
import { b } from './b'
3+
4+
export const sum = a + b

0 commit comments

Comments
 (0)