Enable diff parsing to use file paths specified in preceding XML file tags when processing subsequent raw diff code blocks

Author: robertpiosik

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

@@ -974,6 +974,23 @@ describe('clipboard-parser', () => {
       )
     })
 
+    it('parses a diff patch where the file path is specified using an XML tag preceding the diff block', () => {
+      const test_case = 'diff-with-xml-file-path'
+      const text = load_test_case_file(test_case, `${test_case}.txt`)
+      const result = parse_response({
+        response: text,
+        is_single_root_folder_workspace: true
+      })
+
+      expect(result.type).toBe('patches')
+      expect(result.patches).toHaveLength(1)
+
+      expect(result.patches![0].file_path).toBe('src/index.ts')
+      expect(result.patches![0].content).toBe(
+        load_test_case_file(test_case, 'file-1.txt')
+      )
+    })
+
     it('parses diff correctly when content contains nested backticks', () => {
       const test_case = 'diff-inner-backticks'
       const text = load_test_case_file(test_case, `${test_case}.txt`)

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/extract-diff-patches/extract-diffs.ts

@@ -337,9 +337,31 @@ const extract_all_code_block_patches = (params: {
   const files_with_diffs = new Set<string>()
   const diff_block_patches = new Map<number, Diff[]>()
 
-  for (const block of code_blocks) {
-    if (block.type === 'diff' || block.type === 'patch') {
+  for (let i = 0; i < code_blocks.length; i++) {
+    const block = code_blocks[i]
+    if (block.type == 'diff' || block.type == 'patch') {
+      let file_path_hint: string | undefined
+      if (i > 0) {
+        const prev_block_lines = lines.slice(
+          code_blocks[i - 1].start + 1,
+          code_blocks[i - 1].end
+        )
+        const xml_path_regex = /<file\s+path=["']([^"']+)["']/
+        const non_empty_lines = prev_block_lines.filter((l) => l.trim() != '')
+        if (non_empty_lines.length === 1) {
+          const match = non_empty_lines[0].match(xml_path_regex)
+          if (match && match[1]) {
+            file_path_hint = match[1]
+          }
+        }
+      }
       const block_lines = lines.slice(block.start + 1, block.end)
+      if (file_path_hint) {
+        const { from_path, to_path } = extract_paths_from_lines(block_lines)
+        if (!from_path && !to_path) {
+          block_lines.unshift(`--- /dev/null`, `+++ b/${file_path_hint}`)
+        }
+      }
       const parsed_patches = parse_multiple_raw_patches({
         all_lines: block_lines,
         is_single_root: params.is_single_root
@@ -355,11 +377,28 @@ const extract_all_code_block_patches = (params: {
   }
 
   // Process each found code block in order of appearance.
-  for (const block of code_blocks) {
+  for (let i = 0; i < code_blocks.length; i++) {
+    const block = code_blocks[i]
     const block_lines = lines.slice(block.start + 1, block.end) // Exclude the ``` lines
     if (block.type == 'diff' || block.type == 'patch') {
       patches.push(...(diff_block_patches.get(block.start) || []))
     } else {
+      // Check if this block was a hint for the next block.
+      if (i < code_blocks.length - 1) {
+        const next_block = code_blocks[i + 1]
+        if (next_block.type === 'diff' || next_block.type === 'patch') {
+          const xml_path_regex = /<file\s+path=["']([^"']+)["']/
+          const non_empty_lines = block_lines.filter((l) => l.trim() !== '')
+          if (non_empty_lines.length === 1) {
+            const match = non_empty_lines[0].match(xml_path_regex)
+            if (match && match[1]) {
+              // This was a hint for the next block, so we should skip processing it as a file content block.
+              continue
+            }
+          }
+        }
+      }
+
       // Check if there's a comment line before the code block with a file path
       let file_path_hint: string | undefined
       let workspace_hint: string | undefined

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-with-xml-file-path/diff-with-xml-file-path.txt

@@ -0,0 +1,7 @@
+```markdown
+<file path="src/index.ts" new>
+```
+```diff
+@@ -0,0 +1,1 @@
++console.log('hello')
+```

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-with-xml-file-path/file-1.txt

@@ -0,0 +1,4 @@
+--- /dev/null
++++ b/src/index.ts
+@@ -0,0 +1,1 @@
++console.log('hello')