Enhance the clipboard parser to support diff blocks without hunk headers and update edit format instructions for better formatting consistency

Author: robertpiosik

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

@@ -1999,6 +1999,21 @@ describe('clipboard-parser', () => {
       })
     })
 
+    it('parses diff format when the file path is specified in a markdown heading above a diff block that lacks hunk headers', () => {
+      const test_case = 'diff-markdown-path-above-no-hunk-header'
+      const text = load_test_case_file('diffs', test_case, `${test_case}.txt`)
+      const result = parse_response({
+        response: text,
+        is_single_root_folder_workspace: true
+      })
+      expect(result).toHaveLength(1)
+      expect(result[0]).toMatchObject({
+        type: 'diff',
+        file_path: 'src/index.ts',
+        content: load_test_case_file('diffs', test_case, '1-file.txt')
+      })
+    })
+
     it('parses diff format with redundant closing backticks', () => {
       const test_case = 'diff-markdown-redundant-closing-backticks'
       const text = load_test_case_file(

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

@@ -97,7 +97,9 @@ export const parse_response = (params: {
   if (
     hunk_header_regex.test(processed_response) ||
     diff_header_regex.test(processed_response) ||
-    git_diff_header_regex.test(processed_response)
+    git_diff_header_regex.test(processed_response) ||
+    processed_response.includes('```diff') ||
+    processed_response.includes('```patch')
   ) {
     const patches_or_text = extract_diffs({
       clipboard_text: processed_response,

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

@@ -1020,6 +1020,28 @@ const build_patch_content = (params: {
       if (to_line) final_header.push(to_line)
 
       patch_lines = [...final_header, ...formatted_body_lines]
+    } else {
+      const content_start_index = patch_lines.findIndex(
+        (line) =>
+          !line.startsWith('--- ') &&
+          !line.startsWith('+++ ') &&
+          !line.startsWith('diff --git')
+      )
+
+      if (content_start_index !== -1) {
+        const header_lines = patch_lines.slice(0, content_start_index)
+        const content_lines = patch_lines.slice(content_start_index)
+        const is_new_file_content =
+          content_lines.length > 0 &&
+          content_lines.every(
+            (line) => line.startsWith('+') || line.trim() === ''
+          )
+
+        if (is_new_file_content) {
+          const hunk_header = `@@ -0,0 +1,${content_lines.length} @@`
+          patch_lines = [...header_lines, hunk_header, ...content_lines]
+        }
+      }
     }
 
     patch_content = patch_lines
@@ -1052,7 +1074,18 @@ const build_patch_content = (params: {
               is_single_root_folder_workspace: false
             }).relative_path
           : params.file_path
-      patch_content = `--- a/${relative_file_path}\n+++ b/${relative_file_path}`
+      const content_lines = params.lines
+      const is_new_file =
+        content_lines.length > 0 &&
+        content_lines.every((l) => l.startsWith('+') || l.trim() === '')
+
+      let body = params.lines.join('\n')
+      if (is_new_file) {
+        const hunk_header = `@@ -0,0 +1,${content_lines.length} @@`
+        body = `${hunk_header}\n${body}`
+      }
+
+      patch_content = `--- a/${relative_file_path}\n+++ b/${relative_file_path}\n${body}`
     } else {
       const patch_body_lines = params.lines.slice(content_start_index)
       const formatted_patch_body_lines = format_hunk_headers(patch_body_lines)

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diffs/diff-markdown-path-above-no-hunk-header/1-file.txt

@@ -0,0 +1,5 @@
+--- a/src/index.ts
++++ b/src/index.ts
+@@ -0,0 +1,2 @@
++console.log("hello")
++console.log("world")

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diffs/diff-markdown-path-above-no-hunk-header/diff-markdown-path-above-no-hunk-header.txt

@@ -0,0 +1,6 @@
+### `src/index.ts`:
+
+```diff
++console.log("hello")
++console.log("world")
+```

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diffs/diff-markdown-path-above/diff-markdown-path-above.txt

@@ -4,4 +4,5 @@
 @@ -1,3 +1,3 @@
  console.log("hello")
 -console.log("old message")
-+console.log("new message")
++console.log("new message")
+```

packages/vscode/src/constants/edit-format-instructions.ts

@@ -1,6 +1,6 @@
-const intro = `Whenever showing a new, updated, renamed or deleted file, provide a brief explanation, then print the path in a markdown heading (e.g. ### New file: \`src/examples/hello.py\`, ### Updated file: \`src/examples/hello.py\`, ### Renamed file: \`src/examples/hello.py\` (old) \`src/welcome.py\` (new), ### Deleted file: \`src/examples/hello.py\`), followed by a file within a markdown code block, when necessary.`
+const intro = `Whenever showing a new, updated, renamed or deleted file, provide a brief explanation, then print the path in a markdown heading (e.g. ### New file: \`src/examples/hello.py\`, ### Updated file: \`src/examples/hello.py\`, ### Renamed file: \`src/examples/hello.py\` (old) \`src/welcome.py\` (new), ### Deleted file: \`src/examples/hello.py\`)`
 
-export const EDIT_FORMAT_INSTRUCTIONS_WHOLE = `${intro} You must show file contents in full—as I have a disability which means I can't type and need to be able to just copy and paste. Example:
+export const EDIT_FORMAT_INSTRUCTIONS_WHOLE = `${intro}, followed by a markdown code block with the file's full contents—as I have a disability which means I can't type and need to be able to just copy and paste. Example:
 Updated the greeting text.
 
 ### Updated file: \`src/examples/hello.py\`
@@ -12,7 +12,7 @@ def show_greeting():
   print(GREETING)
 \`\`\``
 
-export const EDIT_FORMAT_INSTRUCTIONS_TRUNCATED = `${intro} As a space saving measure, replace unchanged function bodies with ellipsis comments, e.g. "# ...". Example:
+export const EDIT_FORMAT_INSTRUCTIONS_TRUNCATED = `${intro}, followed by a markdown code block with file's contents. As a space saving measure, replace unchanged function bodies with ellipsis comments, e.g. "# ...". Example:
 Updated the greeting text.
 
 ### Updated file: \`src/examples/hello.py\`
@@ -28,7 +28,7 @@ def show_greeting():
   # ...
 \`\`\``
 
-export const EDIT_FORMAT_INSTRUCTIONS_DIFF = `${intro} Whenever showing changes to the original files, use the Unified Diff format. Example:
+export const EDIT_FORMAT_INSTRUCTIONS_DIFF = `${intro}, followed by a unified diff within a markdown code block. Example:
 Updated the greeting text.
 
 ### Updated file: \`src/examples/hello.py\`
@@ -44,7 +44,7 @@ Updated the greeting text.
    print(GREETING)
 \`\`\``
 
-export const EDIT_FORMAT_INSTRUCTIONS_BEFORE_AFTER = `${intro} Whenever showing changes to the original files, use Git-style merge conflict markers. Example:
+export const EDIT_FORMAT_INSTRUCTIONS_BEFORE_AFTER = `${intro}, followed by a markdown code block showing the original and updated code snippets with Git-style merge conflict markers. Example:
 Updated the greeting text.
 
 ### Updated file: \`src/examples/hello.py\`