Improve diff parsing by correctly handling timestamps in file headers

Author: robertpiosik

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

@@ -390,30 +390,30 @@ describe('clipboard-parser', () => {
 `)
     })
 
-//     it('should parse multiple diff files format in variant f', () => {
-//       const text = load_clipboard_text('diff-multiple-files-variant-f.txt')
-//       const result = parse_clipboard_content(text, true)
-
-//       expect(result.type).toBe('patches')
-//       expect(result.patches).toHaveLength(2)
-
-//       expect(result.patches![0].file_path).toBe('src/lorem.ts')
-//       expect(result.patches![1].file_path).toBe('src/ipsum.ts')
-
-//       expect(result.patches![0].content).toBe(`--- a/src/lorem.ts
-// +++ b/src/lorem.ts
-// @@ -1,3 +1,3 @@
-//  console.log("hello")
-// -console.log("old lorem")
-// +console.log("new lorem")
-// `)
-//       expect(result.patches![1].content).toBe(`--- a/src/ipsum.ts
-// +++ b/src/ipsum.ts
-// @@ -1,3 +1,3 @@
-//  console.log("hello")
-// -console.log("old ipsum")
-// +console.log("new ipsum")
-// `)
-//     })
+    it('should parse multiple diff files format in variant f', () => {
+      const text = load_clipboard_text('diff-multiple-files-variant-f.txt')
+      const result = parse_clipboard_content(text, true)
+
+      expect(result.type).toBe('patches')
+      expect(result.patches).toHaveLength(2)
+
+      expect(result.patches![0].file_path).toBe('src/lorem.ts')
+      expect(result.patches![1].file_path).toBe('src/ipsum.ts')
+
+      expect(result.patches![0].content).toBe(`--- a/src/lorem.ts
++++ b/src/lorem.ts
+@@ -1,3 +1,3 @@
+ console.log("hello")
+-console.log("old lorem")
++console.log("new lorem")
+`)
+      expect(result.patches![1].content).toBe(`--- a/src/ipsum.ts
++++ b/src/ipsum.ts
+@@ -1,3 +1,3 @@
+ console.log("hello")
+-console.log("old ipsum")
++console.log("new ipsum")
+`)
+    })
   })
 })

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

@@ -63,7 +63,8 @@ export const extract_diff_patches = (clipboard_text: string): DiffPatch[] => {
         // Extract patch content starting from the --- line
         const patch_lines = lines.slice(patch_start_index).map((line) => {
           if (line.startsWith('--- a/') || line.startsWith('+++ b/')) {
-            return line.replace(/\t.*$/, '') // Remove everything after tab
+            // Remove timestamps and everything after tab
+            return line.replace(/\s+\d{4}-\d{2}-\d{2}.*$/, '').replace(/\t.*$/, '')
           }
           return line
         })
@@ -180,16 +181,20 @@ export const extract_diff_patches = (clipboard_text: string): DiffPatch[] => {
           const final_patch_lines = patch_content.split('\n')
           const formatted_patch_lines: string[] = []
           for (const patch_line of final_patch_lines) {
-            // Check if line starts with @@ and has content after it without newline
-            const hunk_match = patch_line.match(
-              /^(@@ -\d+,\d+ \+\d+,\d+ @@)(.*)$/
-            )
-            if (hunk_match && hunk_match[2].trim() != '') {
-              // Split hunk header and content onto separate lines
-              formatted_patch_lines.push(hunk_match[1])
-              formatted_patch_lines.push(hunk_match[2])
-            } else {
-              formatted_patch_lines.push(patch_line)
+            // Remove timestamps from ---/+++ lines
+            if (patch_line.startsWith('--- a/') || patch_line.startsWith('+++ b/')) {
+              formatted_patch_lines.push(patch_line.replace(/\s+\d{4}-\d{2}-\d{2}.*$/, ''))
+            } 
+            // Handle hunk headers
+            else {
+              const hunk_match = patch_line.match(/^(@@ -\d+,\d+ \+\d+,\d+ @@)(.*)$/)
+              if (hunk_match && hunk_match[2].trim() != '') {
+                // Split hunk header and content onto separate lines
+                formatted_patch_lines.push(hunk_match[1])
+                formatted_patch_lines.push(hunk_match[2])
+              } else {
+                formatted_patch_lines.push(patch_line)
+              }
             }
           }
           patch_content = formatted_patch_lines.join('\n')
@@ -212,7 +217,7 @@ export const extract_diff_patches = (clipboard_text: string): DiffPatch[] => {
 
       // Extract file path from the +++ line or diff --git line
       if (!current_file_path) {
-        const file_path_match = line.match(/^\+\+\+ b\/(.+)$/)
+        const file_path_match = line.match(/^\+\+\+ b\/(.+?)(?:\s+\d{4}-\d{2}-\d{2}.*)?$/)
         if (file_path_match) {
           current_file_path = file_path_match[1]
         } else {
@@ -230,4 +235,4 @@ export const extract_diff_patches = (clipboard_text: string): DiffPatch[] => {
 
     return patches
   }
-}
+}