Handle merge conflicts for the same file across multiple code blocks by combining content and adjacent text

Author: robertpiosik

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.spec.ts

@@ -427,6 +427,30 @@ describe('clipboard-parser', () => {
       })
     })
 
+    it('merges content and text when multiple merge conflicts for the same file are provided in separate code blocks with text between them', () => {
+      const test_case = 'merge-conflicts-merge-the-same-file'
+      const text = load_test_case_file(
+        'standard',
+        test_case,
+        `${test_case}.txt`
+      )
+      const result = parse_response({
+        response: text,
+        is_single_root_folder_workspace: true
+      })
+
+      expect(result).toHaveLength(2)
+      expect(result[0]).toMatchObject({
+        type: 'text',
+        content: load_test_case_file('standard', test_case, '1-text.txt')
+      })
+      expect(result[1]).toMatchObject({
+        type: 'file',
+        file_path: 'src/index.ts',
+        content: load_test_case_file('standard', test_case, '2-file.txt')
+      })
+    })
+
     it('merges content when merge conflicts use three dots notation', () => {
       const test_case = 'merge-conflicts-three-dots'
       const text = load_test_case_file(

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/multiple-files-parser/helpers/item-management.ts

@@ -35,6 +35,43 @@ export const create_or_update_file_item = (params: {
 
     if (mode == 'append') {
       existing_file.content = existing_file.content + '\n' + processed_content
+
+      const file_index = results.indexOf(existing_file)
+      if (file_index >= 0) {
+        const text_indices: number[] = []
+        for (let i = file_index + 1; i < results.length; i++) {
+          if (results[i].type == 'text') {
+            text_indices.push(i)
+          }
+        }
+
+        if (text_indices.length > 0) {
+          const text_contents = text_indices
+            .map((idx) => (results[idx] as TextItem).content.trim())
+            .filter((c) => c)
+
+          for (let i = text_indices.length - 1; i >= 0; i--) {
+            results.splice(text_indices[i], 1)
+          }
+
+          if (text_contents.length > 0) {
+            const combined = text_contents.join('\n')
+            const updated_file_index = results.indexOf(existing_file)
+            if (
+              updated_file_index > 0 &&
+              results[updated_file_index - 1].type == 'text'
+            ) {
+              const prev_text = results[updated_file_index - 1] as TextItem
+              prev_text.content = prev_text.content.trim() + '\n' + combined
+            } else {
+              results.splice(updated_file_index, 0, {
+                type: 'text' as const,
+                content: combined
+              })
+            }
+          }
+        }
+      }
     } else {
       existing_file.content = processed_content
     }

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/multiple-files-parser/multiple-files-parser.ts

@@ -168,7 +168,19 @@ export const parse_multiple_files = (params: {
                 current_block_mode = 'overwrite'
               }
             } else {
-              current_block_mode = 'overwrite'
+              const file_key = `${current_workspace_name || ''}:${current_file_name}`
+              const existing_file = file_ref_map.get(file_key)
+              const has_conflict_markers =
+                existing_file &&
+                existing_file.content.includes('<<<<<<<') &&
+                existing_file.content.includes('>>>>>>>') &&
+                existing_file.content.includes('=======')
+
+              if (has_conflict_markers) {
+                current_block_mode = 'append'
+              } else {
+                current_block_mode = 'overwrite'
+              }
               header_path_already_used = true
             }
           } else {

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/standard/merge-conflicts-merge-the-same-file/1-text.txt

@@ -0,0 +1,2 @@
+Lorem.
+Ipsum.

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/standard/merge-conflicts-merge-the-same-file/2-file.txt

@@ -0,0 +1,10 @@
+<<<<<<< ORIGINAL
+  console.log("a")
+=======
+  console.log("b")
+>>>>>>> UPDATED
+<<<<<<< ORIGINAL
+    console.log("c")
+=======
+    console.log("d")
+>>>>>>> UPDATED

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/standard/merge-conflicts-merge-the-same-file/merge-conflicts-merge-the-same-file.txt

@@ -0,0 +1,23 @@
+Lorem.
+
+### Updated file: `src\index.ts`
+
+```typescript
+<<<<<<< ORIGINAL
+  console.log("a")
+=======
+  console.log("b")
+>>>>>>> UPDATED
+```
+
+Ipsum.
+
+### Updated file: `src\index.ts`
+
+```typescript
+<<<<<<< ORIGINAL
+    console.log("c")
+=======
+    console.log("d")
+>>>>>>> UPDATED
+```

apps/editor/src/commands/search-files-for-context.ts

@@ -111,6 +111,9 @@ export const search_files_for_context_command = (
             }
           }
 
+          console.log(search_term)
+          console.log(all_files)
+
           const matched_files = await search_files_by_keywords({
             files: all_files,
             search_term