Filter out empty lines in diff patches to correctly parse responses with interspersed blank lines

Author: robertpiosik

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

@@ -2131,6 +2131,22 @@ describe('clipboard-parser', () => {
       })
     })
 
+    it('parses diff with empty lines interspersed between headers and content', () => {
+      const test_case = 'diff-with-empty-lines-between'
+      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/parsers/diff-parser/diff-parser.ts

@@ -22,7 +22,10 @@ const process_collected_patch_lines = (params: {
   patch_lines_array: string[]
   is_single_root: boolean
 }): DiffItem | null => {
-  const lines = [...params.patch_lines_array]
+  let lines = [...params.patch_lines_array]
+
+  lines = lines.filter((l) => l.length > 0)
+
   while (lines.length > 0 && lines[lines.length - 1].trim() == '') {
     lines.pop()
   }

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diffs/diff-with-empty-lines-between/1-file.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")

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diffs/diff-with-empty-lines-between/diff-with-empty-lines-between.txt

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