Prevent code blocks containing truncation comments from being incorrectly converted into new file patches

Author: robertpiosik

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

@@ -101,12 +101,7 @@ export const parse_response = (params: {
       is_single_root: is_single_root_folder_workspace
     })
     if (patches_or_text.length) {
-      return patches_or_text.map((item) => {
-        if ('type' in item && item.type == 'text') {
-          return item
-        }
-        return { type: 'diff', ...item }
-      })
+      return patches_or_text
     }
   }
 

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

@@ -3,6 +3,7 @@ import { extract_path_from_line_of_code } from '@shared/utils/extract-path-from-
 import { extract_workspace_and_path } from '../clipboard-parser'
 
 export type Diff = {
+  type: 'diff'
   file_path: string
   content: string
   workspace_name?: string
@@ -133,6 +134,7 @@ const process_collected_patch_lines = (params: {
   })
 
   const patch: Diff = {
+    type: 'diff',
     file_path: relative_path,
     workspace_name,
     content: content_str.endsWith('\n') ? content_str : content_str + '\n'
@@ -227,7 +229,8 @@ const convert_code_block_to_new_file_diff = (params: {
 
         if (
           (potential_path.includes('.') || potential_path.includes('/')) &&
-          !potential_path.includes(' ')
+          !potential_path.includes(' ') &&
+          /[a-zA-Z0-9]/.test(potential_path)
         ) {
           const rest_of_line = line
             .substring(line.indexOf(potential_path) + potential_path.length)
@@ -279,6 +282,7 @@ const convert_code_block_to_new_file_diff = (params: {
     ].join('\n')
 
     return {
+      type: 'diff',
       file_path: relative_path,
       workspace_name,
       content: patch_content + '\n'
@@ -299,6 +303,7 @@ const convert_code_block_to_new_file_diff = (params: {
   ].join('\n')
 
   return {
+    type: 'diff',
     file_path: relative_path,
     workspace_name,
     content: patch_content + '\n'
@@ -417,13 +422,30 @@ const extract_all_code_block_patches = (params: {
   // Process each found code block in order of appearance.
   for (let i = 0; i < code_blocks.length; i++) {
     const block = code_blocks[i]
+    const block_lines = lines.slice(block.start + 1, block.end)
+
+    if (block.type != 'diff' && block.type != 'patch') {
+      const has_truncation_comment = block_lines.some((line) => {
+        const trimmed = line.trim()
+        return (
+          trimmed.startsWith('// ...') ||
+          trimmed.startsWith('# ...') ||
+          trimmed.startsWith('/* ...') ||
+          trimmed.startsWith('* ...') ||
+          trimmed.startsWith('-- ...') ||
+          trimmed.startsWith('<!-- ...')
+        )
+      })
+      if (has_truncation_comment) {
+        continue
+      }
+    }
 
     const text_before = lines.slice(last_block_end + 1, block.start).join('\n')
     if (text_before.trim()) {
       items.push({ type: 'text', content: text_before.trim() })
     }
 
-    const block_lines = lines.slice(block.start + 1, block.end) // Exclude the ``` lines
     if (block.type == 'diff' || block.type == 'patch') {
       items.push(...(diff_block_patches.get(block.start) || []))
     } else {
@@ -493,6 +515,11 @@ const extract_all_code_block_patches = (params: {
           }
           items.push(patch)
         }
+      } else {
+        const block_content = lines.slice(block.start, block.end + 1).join('\n')
+        if (block_lines.join('').trim()) {
+          items.push({ type: 'text', content: block_content })
+        }
       }
     }
     last_block_end = block.end

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-multiple-files-text-between/1-text.txt

@@ -1 +1,6 @@
-Top.
+Lorem ipsum `src/index.ts`
+
+```ts
+console.log();
+// ...
+```

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

@@ -1,4 +1,10 @@
-Top.
+Lorem ipsum `src/index.ts`
+
+```ts
+console.log();
+// ...
+```
+
 
 ```diff
 --- a/src/lorem.ts