Pre-process clipboard responses to correctly split concatenated markdown code blocks separated by six backticks

Author: robertpiosik

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

@@ -705,6 +705,28 @@ describe('clipboard-parser', () => {
       )
     })
 
+    it('parses multiple diffs where code blocks end and start on the same line', () => {
+      const test_case = 'diff-multiple-files-same-line-backticks'
+      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(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(
+        load_test_case_file(test_case, 'file-1.txt')
+      )
+      expect(result.patches![1].content).toBe(
+        load_test_case_file(test_case, 'file-2.txt')
+      )
+    })
+
     it('parses multiple diffs concatenated within a single markdown code block', () => {
       const test_case = 'diff-multiple-files-single-markdown-block'
       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

@@ -637,14 +637,16 @@ export const parse_response = (params: {
     return { type: 'code-completion', code_completion }
   }
 
+  const processed_response = params.response.replace(/``````/g, '```\n```')
+
   if (
-    params.response.includes('```diff') ||
-    params.response.includes('```patch') ||
-    params.response.startsWith('--- ') ||
-    params.response.startsWith('diff --git')
+    processed_response.includes('```diff') ||
+    processed_response.includes('```patch') ||
+    processed_response.startsWith('--- ') ||
+    processed_response.startsWith('diff --git')
   ) {
     const patches = extract_diffs({
-      clipboard_text: params.response,
+      clipboard_text: processed_response,
       is_single_root: is_single_root_folder_workspace
     })
     if (patches.length) {
@@ -653,7 +655,7 @@ export const parse_response = (params: {
   }
 
   const files = parse_multiple_files({
-    response: params.response,
+    response: processed_response,
     is_single_root_folder_workspace
   })
 

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-multiple-files-same-line-backticks/diff-multiple-files-same-line-backticks.txt

@@ -0,0 +1,15 @@
+```diff
+--- a/src/lorem.ts
++++ b/src/lorem.ts
+@@ -1,3 +1,3 @@
+ console.log("hello")
+-console.log("old lorem")
++console.log("new lorem")
+``````diff
+--- 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/test-cases/diff-multiple-files-same-line-backticks/file-1.txt

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

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-multiple-files-same-line-backticks/file-2.txt

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