Add support for parsing diffs with redundant deletion headers and prevent duplicate diff patches

Author: robertpiosik

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

@@ -1406,6 +1406,22 @@ describe('clipboard-parser', () => {
       })
     })
 
+    it('parses diff and deletion via redundant header', () => {
+      const test_case = 'diff-deletion-via-redundant-header'
+      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).toHaveLength(1)
+      expect(result[0]).toMatchObject({
+        type: 'diff',
+        file_path: 'src/index.ts',
+        content: load_test_case_file(test_case, '1-file.txt')
+      })
+    })
+
     it('parses a mix of a new file from heading and code block, and a separate diff block', () => {
       const test_case = 'diff-mix-new-file-from-heading-and-diff'
       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

@@ -711,14 +711,26 @@ const extract_all_code_block_patches = (params: {
 
     if (block.type == 'diff' || block.type == 'patch') {
       const text_before_lines = lines.slice(last_block_end + 1, block.start)
-      items.push(
-        ...process_text_for_deleted_files({
-          lines: text_before_lines,
-          is_single_root: params.is_single_root
+      const preceding_items = process_text_for_deleted_files({
+        lines: text_before_lines,
+        is_single_root: params.is_single_root
+      })
+      items.push(...preceding_items)
+
+      let patches = diff_block_patches.get(block.start) || []
+
+      if (patches.length > 0) {
+        patches = patches.filter((p) => {
+          const is_redundant = preceding_items.some(
+            (item) =>
+              item.type == 'diff' &&
+              item.file_path == p.file_path &&
+              item.workspace_name == p.workspace_name
+          )
+          return !is_redundant
         })
-      )
+      }
 
-      const patches = diff_block_patches.get(block.start) || []
       if (patches.length > 0) {
         const last_item = items.length > 0 ? items[items.length - 1] : undefined
         if (last_item && last_item.type == 'text') {

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-deletion-via-redundant-header/1-file.txt

@@ -0,0 +1,3 @@
+--- a/src/index.ts
++++ /dev/null
+@@ +0,0 +0,0 @@

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-deletion-via-redundant-header/diff-deletion-via-redundant-header.txt

@@ -0,0 +1,9 @@
+### Deleted file: `src/index.ts`
+
+```diff
+--- a/src/index.ts
++++ /dev/null
+@@ -1,2 +0,0 @@
+-console.log("hello")
+-console.log("old message")
+```

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

@@ -120,7 +120,7 @@ export const preview = async (params: {
       })
     }
 
-    if (prepared_files.length === 0) {
+    if (prepared_files.length == 0) {
       return null
     }