Skip to content

Commit 85c7251

Browse files
committed
Refactor diff processor block handling and add generic test case 9
- [Pasted text]
1 parent f459311 commit 85c7251

5 files changed

Lines changed: 41 additions & 16 deletions

File tree

‎apps/editor/src/commands/apply-response-command/utils/edit-formats/diffs/diff-processor.spec.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,20 @@ describe('diff-processor', () => {
195195
expect(result).toBe(expected)
196196
})
197197

198+
it('applies diff with generic test case 9 correctly', async () => {
199+
const test_case = 'generic-9'
200+
const original = load_test_case_file('', test_case, 'original.txt')
201+
const diff = load_test_case_file('', test_case, 'diff.txt')
202+
const expected = load_test_case_file('', test_case, 'expected.txt')
203+
204+
const result = apply_diff({
205+
original_code: original,
206+
diff_patch: diff
207+
})
208+
209+
expect(result).toBe(expected)
210+
})
211+
198212
it('applies diff with loose gap matching correctly', async () => {
199213
const test_case = 'loose-gap-match'
200214
const original = load_test_case_file('', test_case, 'original.txt')

‎apps/editor/src/commands/apply-response-command/utils/edit-formats/diffs/diff-processor.ts‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,23 @@ export const apply_diff = (params: {
160160
let current_search_index_tracker = -1
161161

162162
const push_block = () => {
163+
while (
164+
search_chunks.length > 0 &&
165+
search_chunks[search_chunks.length - 1] == '~nnn' &&
166+
replace_chunks.length > 0 &&
167+
replace_chunks[replace_chunks.length - 1].search_index ===
168+
search_chunks.length - 1
169+
) {
170+
search_chunks.pop()
171+
replace_chunks.pop()
172+
if (
173+
after_search_chunks.length > 0 &&
174+
after_search_chunks[after_search_chunks.length - 1] == '~nnn'
175+
) {
176+
after_search_chunks.pop()
177+
}
178+
}
179+
163180
if (search_chunks.length > 0 || replace_chunks.length > 0) {
164181
if (current_block_has_changes) {
165182
search_replace_blocks.push({
@@ -255,22 +272,7 @@ export const apply_diff = (params: {
255272
}
256273
}
257274

258-
if (search_chunks.length > 0 || replace_chunks.length > 0) {
259-
if (
260-
search_chunks[search_chunks.length - 1] == '~nnn' &&
261-
!inside_replace_block
262-
) {
263-
search_chunks.pop()
264-
replace_chunks.pop()
265-
if (
266-
after_search_chunks.length > 0 &&
267-
after_search_chunks[after_search_chunks.length - 1] == '~nnn'
268-
) {
269-
after_search_chunks.pop()
270-
}
271-
}
272-
push_block()
273-
}
275+
push_block()
274276

275277
let previous_found_index = 0
276278
for (let i = 0; i < search_replace_blocks.length; i++) {
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
--- a/apps/editor/src/features/search-files/index.ts
2+
+++ b/apps/editor/src/features/search-files/index.ts
3+
@@ -1,3 +1,3 @@
4+
5+
-export * from './actions/search-files'
6+
+export * from './search-files'
7+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './search-files'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './actions/search-files'

0 commit comments

Comments
 (0)