Enable parsing of standard diff patches embedded within non-diff markdown code blocks by detecting hunk headers

Author: robertpiosik

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

@@ -622,6 +622,22 @@ describe('clipboard-parser', () => {
       )
     })
 
+    it('parses a diff inside a non-diff code block', () => {
+      const test_case = 'diff-in-non-diff-code-block'
+      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 format for a file deletion', () => {
       const test_case = 'diff-file-deletion'
       const text = load_test_case_file(test_case, `${test_case}.txt`)

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

@@ -734,11 +734,14 @@ export const parse_response = (params: {
 
   const processed_response = params.response.replace(/``````/g, '```\n```')
 
+  const hunk_header_regex = /^(@@\s+-\d+(?:,\d+)?\s+\+\d+(?:,\d+)?\s+@@)/m
+
   if (
     processed_response.includes('```diff') ||
     processed_response.includes('```patch') ||
     processed_response.startsWith('--- ') ||
-    processed_response.startsWith('diff --git')
+    processed_response.startsWith('diff --git') ||
+    hunk_header_regex.test(processed_response)
   ) {
     const patches = extract_diffs({
       clipboard_text: processed_response,

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

@@ -249,6 +249,30 @@ const convert_code_block_to_new_file_diff = (params: {
     return null
   }
 
+  const first_real_content_line = content_lines.find((l) => l.trim() != '')
+  if (
+    first_real_content_line &&
+    first_real_content_line
+      .trim()
+      .match(/^(@@ -\d+(?:,\d+)? \+\d+(?:,\d+)? @@)/)
+  ) {
+    const { workspace_name, relative_path } = extract_workspace_and_path(
+      file_path,
+      params.is_single_root
+    )
+    const patch_content = [
+      `--- a/${relative_path}`,
+      `+++ b/${relative_path}`,
+      ...content_lines
+    ].join('\n')
+
+    return {
+      file_path: relative_path,
+      workspace_name,
+      content: patch_content + '\n'
+    }
+  }
+
   const { workspace_name, relative_path } = extract_workspace_and_path(
     file_path,
     params.is_single_root

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-in-non-diff-code-block/diff-in-non-diff-code-block.txt

@@ -0,0 +1,7 @@
+```typescript
+src/index.ts
+@@ -1,3 +1,3 @@
+ console.log("hello")
+-console.log("old message")
++console.log("new message")
+```

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-in-non-diff-code-block/file-1.txt

@@ -0,0 +1,6 @@
+--- a/src/index.ts
++++ b/src/index.ts
+@@ -1,3 +1,3 @@
+ console.log("hello")
+-console.log("old message")
++console.log("new message")