Refactor clipboard parsing types by unifying ClipboardFile and ClipboardCodeCompletion into the new FileItem and CompletionItem interfaces, ensuring all parsed items explicitly include a type field

Author: robertpiosik

packages/vscode/src/commands/apply-chat-response-command/handlers/fast-replace-handler.ts

@@ -4,19 +4,19 @@ import * as fs from 'fs'
 import { Logger } from '@shared/utils/logger'
 import { dictionary } from '@shared/constants/dictionary'
 import { create_safe_path, sanitize_file_name } from '@/utils/path-sanitizer'
-import { ClipboardFile } from '../utils/clipboard-parser'
+import { FileItem } from '../utils/clipboard-parser'
 import { OriginalFileState } from '@/commands/apply-chat-response-command/types/original-file-state'
 
 export const handle_fast_replace = async (
-  files: ClipboardFile[]
+  files: FileItem[]
 ): Promise<{ success: boolean; original_states?: OriginalFileState[] }> => {
   Logger.info({
     function_name: 'handle_fast_replace',
     message: 'start',
     data: { file_count: files.length }
   })
   try {
-    const safe_files: ClipboardFile[] = []
+    const safe_files: FileItem[] = []
     const unsafe_files: string[] = []
 
     if (

packages/vscode/src/commands/apply-chat-response-command/handlers/intelligent-update-handler.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import axios from 'axios'
 import * as path from 'path'
 import * as fs from 'fs'
-import { ClipboardFile } from '../utils/clipboard-parser'
+import { FileItem } from '../utils/clipboard-parser'
 import { sanitize_file_name, create_safe_path } from '@/utils/path-sanitizer'
 import { Logger } from '@shared/utils/logger'
 import { OriginalFileState } from '@/commands/apply-chat-response-command/types/original-file-state'
@@ -53,10 +53,10 @@ export const handle_intelligent_update = async (params: {
   })
 
   const raw_files = raw_items.filter(
-    (item): item is ClipboardFile => 'file_path' in item
+    (item): item is FileItem => item.type == 'file'
   )
 
-  const files: ClipboardFile[] = []
+  const files: FileItem[] = []
   const skipped_files: string[] = []
 
   for (const file of raw_files) {
@@ -120,8 +120,8 @@ export const handle_intelligent_update = async (params: {
     return null
   }
 
-  const new_files: ClipboardFile[] = []
-  const existing_files: ClipboardFile[] = []
+  const new_files: FileItem[] = []
+  const existing_files: FileItem[] = []
 
   for (const file of files) {
     let file_exists = false

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

@@ -1,20 +1,6 @@
 import { extract_diffs } from './extract-diff-patches'
 import { parse_code_completion, parse_multiple_files } from './parsers'
 
-export interface ClipboardFile {
-  file_path: string
-  content: string
-  workspace_name?: string
-}
-
-export interface ClipboardCodeCompletion {
-  file_path: string
-  content: string
-  line: number
-  character: number
-  workspace_name?: string
-}
-
 export interface FileItem {
   type: 'file'
   file_path: string
@@ -98,7 +84,7 @@ export const parse_response = (params: {
     is_single_root_folder_workspace
   })
   if (code_completion) {
-    return [{ type: 'completion', ...code_completion }]
+    return [code_completion]
   }
 
   const processed_response = params.response.replace(/``````/g, '```\n```')
@@ -129,10 +115,5 @@ export const parse_response = (params: {
     is_single_root_folder_workspace
   })
 
-  return items.map((item) => {
-    if ('file_path' in item) {
-      return { type: 'file', ...item }
-    }
-    return item
-  })
+  return items
 }

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

@@ -1,8 +1,5 @@
 import { cleanup_api_response } from '@/utils/cleanup-api-response'
-import {
-  ClipboardCodeCompletion,
-  extract_workspace_and_path
-} from '../clipboard-parser'
+import { CompletionItem, extract_workspace_and_path } from '../clipboard-parser'
 
 const extract_path_and_position = (
   line: string
@@ -31,7 +28,7 @@ const extract_path_and_position = (
 export const parse_code_completion = (params: {
   response: string
   is_single_root_folder_workspace: boolean
-}): ClipboardCodeCompletion | null => {
+}): CompletionItem | null => {
   const lines = params.response.split('\n')
   let in_code_block = false
   let first_line_of_block: string | null = null
@@ -50,6 +47,7 @@ export const parse_code_completion = (params: {
                   params.is_single_root_folder_workspace
               })
             return {
+              type: 'completion',
               file_path: relative_path,
               content: cleanup_api_response({
                 content: content_lines.join('\n')

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/file-content-only-parser.ts

@@ -1,14 +1,14 @@
 import { extract_path_from_line_of_code } from '@shared/utils/extract-path-from-line-of-code'
 import {
-  ClipboardFile,
+  FileItem,
   extract_workspace_and_path,
   has_real_code
 } from '../clipboard-parser'
 
 export const parse_file_content_only = (params: {
   response: string
   is_single_root_folder_workspace: boolean
-}): ClipboardFile | null => {
+}): FileItem | null => {
   if (params.response.includes('```')) {
     return null
   }
@@ -44,6 +44,7 @@ export const parse_file_content_only = (params: {
 
   if (has_real_code(cleaned_content)) {
     return {
+      type: 'file',
       file_path: relative_path,
       content: cleaned_content,
       workspace_name: workspace_name

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

@@ -1,6 +1,6 @@
 import { extract_path_from_line_of_code } from '@shared/utils/extract-path-from-line-of-code'
 import {
-  ClipboardFile,
+  FileItem,
   TextItem,
   extract_workspace_and_path,
   has_real_code
@@ -15,14 +15,14 @@ const extract_file_path_from_xml = (line: string): string | null => {
 export const parse_multiple_files = (params: {
   response: string
   is_single_root_folder_workspace: boolean
-}): (ClipboardFile | TextItem)[] => {
+}): (FileItem | TextItem)[] => {
   const file_content_result = parse_file_content_only(params)
   if (file_content_result) {
     return [file_content_result]
   }
 
-  const results: (ClipboardFile | TextItem)[] = []
-  const file_ref_map = new Map<string, ClipboardFile>()
+  const results: (FileItem | TextItem)[] = []
+  const file_ref_map = new Map<string, FileItem>()
   let current_text_block = ''
 
   let state = 'TEXT'
@@ -222,6 +222,7 @@ export const parse_multiple_files = (params: {
               existing_file.content += '\n\n' + final_content
             } else {
               const new_file = {
+                type: 'file' as const,
                 file_path: current_file_name,
                 content: final_content,
                 workspace_name: current_workspace_name
@@ -323,13 +324,28 @@ export const parse_multiple_files = (params: {
             existing_file.content += '\n\n' + cleaned_content
           } else {
             const new_file = {
+              type: 'file' as const,
               file_path: current_file_name,
               content: cleaned_content,
               workspace_name: current_workspace_name
             }
             file_ref_map.set(file_key, new_file)
             results.push(new_file)
           }
+        } else if (!current_file_name) {
+          const raw_code_block = [
+            `\`\`\`${current_language}`,
+            current_content,
+            '```'
+          ].join('\n')
+
+          const last_result =
+            results.length > 0 ? results[results.length - 1] : null
+          if (last_result && last_result.type === 'text') {
+            last_result.content += '\n' + raw_code_block
+          } else {
+            results.push({ type: 'text', content: raw_code_block })
+          }
         }
 
         current_file_name = ''
@@ -441,6 +457,7 @@ export const parse_multiple_files = (params: {
                     existing_file.content += '\n\n' + cleaned_content
                   } else {
                     const new_file = {
+                      type: 'file' as const,
                       file_path: current_file_name,
                       content: cleaned_content,
                       workspace_name: current_workspace_name
@@ -552,6 +569,7 @@ export const parse_multiple_files = (params: {
         existing_file.content += '\n\n' + cleaned_content
       } else {
         const new_file = {
+          type: 'file' as const,
           file_path: current_file_name,
           content: cleaned_content,
           workspace_name: current_workspace_name

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

@@ -1 +1 @@
-Top.
+Top. `abc.ts`

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

@@ -1 +1,4 @@
-Middle.
+Middle.
+```ts
+console.log('some inline code');
+```

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

@@ -1,11 +1,14 @@
-Top.
+Top. `abc.ts`
 
 ```ts
 // src/lorem.ts
 console.log('lorem');
 ```
 
 Middle.
+```ts
+console.log('some inline code');
+```
 
 ```ts
 // src/ipsum.ts

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

@@ -1,10 +1,10 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
-import { ClipboardFile } from './clipboard-parser'
+import { FileItem } from './clipboard-parser'
 import { create_safe_path } from '@/utils/path-sanitizer'
 
 export const check_if_all_files_new = async (
-  files: ClipboardFile[]
+  files: FileItem[]
 ): Promise<boolean> => {
   const workspace_map = new Map<string, string>()
   vscode.workspace.workspaceFolders!.forEach((folder) => {