Add support for parsing and merging conflict markers using three dots notation in code blocks

Author: robertpiosik

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.spec.ts

@@ -399,6 +399,26 @@ describe('clipboard-parser', () => {
       })
     })
 
+    it('merges content when merge conflicts use three dots notation', () => {
+      const test_case = 'merge-conflicts-three-dots'
+      const text = load_test_case_file(
+        'standard',
+        test_case,
+        `${test_case}.txt`
+      )
+      const result = parse_multiple_files({
+        response: text,
+        is_single_root_folder_workspace: true
+      })
+
+      expect(result).toHaveLength(1)
+      expect(result[0]).toMatchObject({
+        type: 'file',
+        file_path: 'src/index.ts',
+        content: load_test_case_file('standard', test_case, '1-file.txt')
+      })
+    })
+
     it('parses file paths that use backslashes as separators', () => {
       const test_case = 'backslash-paths'
       const text = load_test_case_file(

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

@@ -43,6 +43,76 @@ const strip_markdown_code_block = (content: string): string => {
   return trimmed
 }
 
+const process_conflict_markers = (content: string): string => {
+  const lines = content.split('\n')
+  const result_lines: string[] = []
+
+  let i = 0
+  while (i < lines.length) {
+    const line = lines[i]
+    const startMatch = line.match(/^<<<<<<<\s*(.*)$/)
+
+    if (startMatch) {
+      const labelStart = startMatch[1]
+      let j = i + 1
+      let middleIndex = -1
+      let endIndex = -1
+      let labelEnd = ''
+
+      while (j < lines.length) {
+        if (lines[j].match(/^=======\s*$/)) {
+          middleIndex = j
+        } else if (lines[j].match(/^>>>>>>>\s*(.*)$/)) {
+          endIndex = j
+          labelEnd = lines[j].match(/^>>>>>>>\s*(.*)$/)![1]
+          break
+        }
+        j++
+      }
+
+      if (middleIndex !== -1 && endIndex !== -1) {
+        const leftContentLines = lines.slice(i + 1, middleIndex)
+        const rightContentLines = lines.slice(middleIndex + 1, endIndex)
+
+        const splitByDots = (blockLines: string[]) => {
+          const parts: string[][] = []
+          let currentPart: string[] = []
+          for (const l of blockLines) {
+            if (l.trim() === '...') {
+              parts.push(currentPart)
+              currentPart = []
+            } else {
+              currentPart.push(l)
+            }
+          }
+          parts.push(currentPart)
+          return parts
+        }
+
+        const leftParts = splitByDots(leftContentLines)
+        const rightParts = splitByDots(rightContentLines)
+
+        if (leftParts.length > 1 && leftParts.length === rightParts.length) {
+          for (let k = 0; k < leftParts.length; k++) {
+            result_lines.push(`<<<<<<< ${labelStart}`)
+            result_lines.push(...leftParts[k])
+            result_lines.push(`=======`)
+            result_lines.push(...rightParts[k])
+            result_lines.push(`>>>>>>> ${labelEnd}`)
+          }
+          i = endIndex + 1
+          continue
+        }
+      }
+    }
+
+    result_lines.push(line)
+    i++
+  }
+
+  return result_lines.join('\n')
+}
+
 const create_or_update_file_item = (params: {
   file_name: string
   content: string
@@ -66,16 +136,18 @@ const create_or_update_file_item = (params: {
     return
   }
 
+  const processed_content = process_conflict_markers(content)
+
   const file_key = `${workspace_name || ''}:${file_name}`
 
   if (file_ref_map.has(file_key)) {
     const existing_file = file_ref_map.get(file_key)!
     const had_content_before = has_real_code(existing_file.content)
 
     if (mode === 'append') {
-      existing_file.content = existing_file.content + '\n' + content
+      existing_file.content = existing_file.content + '\n' + processed_content
     } else {
-      existing_file.content = content
+      existing_file.content = processed_content
     }
 
     if (renamed_from) {
@@ -95,7 +167,7 @@ const create_or_update_file_item = (params: {
     const new_file: FileItem = {
       type: 'file' as const,
       file_path: file_name,
-      content: content,
+      content: processed_content,
       workspace_name: workspace_name,
       renamed_from
     }
@@ -125,6 +197,11 @@ export const parse_multiple_files = (params: {
 }): (FileItem | TextItem)[] => {
   const file_content_result = parse_file_content_only(params)
   if (file_content_result) {
+    if (file_content_result.type === 'file') {
+      file_content_result.content = process_conflict_markers(
+        file_content_result.content
+      )
+    }
     return [file_content_result]
   }
 

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/standard/merge-conflicts-three-dots/1-file.txt

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

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/standard/merge-conflicts-three-dots/merge-conflicts-three-dots.txt

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