Remove the feature that adds line numbers to collected file content and update the diff format instruction

Author: robertpiosik

packages/vscode/package.json

@@ -650,7 +650,7 @@
           "type": "string",
           "scope": "resource",
           "description": "Style instructions for chat responses when using diff format.",
-          "default": "Whenever proposing a file use the markdown code block syntax. Each code block should be a diff patch without line numbers."
+          "default": "Whenever proposing a file use the markdown code block syntax. Each code block should be a diff patch."
         },
         "codeWebChat.chatCodeCompletionsInstructions": {
           "type": "string",

packages/vscode/src/helpers/files-collector.ts

@@ -27,7 +27,6 @@ export class FilesCollector {
     disable_xml?: boolean
     exclude_path?: string
     active_path?: string
-    with_line_numbers?: boolean
   }): Promise<string> {
     const workspace_files = this.workspace_provider.get_checked_files()
     const open_editor_files =
@@ -59,11 +58,7 @@ export class FilesCollector {
 
         if (stats.isDirectory()) continue
 
-        let content = fs.readFileSync(file_path, 'utf8')
-
-        if (params?.with_line_numbers) {
-          content = this.add_line_numbers(content)
-        }
+        const content = fs.readFileSync(file_path, 'utf8')
 
         // Find which workspace root this file belongs to
         const workspace_root = this.get_workspace_root_for_file(file_path)
@@ -108,19 +103,6 @@ export class FilesCollector {
     return collected_text
   }
 
-  private add_line_numbers(content: string): string {
-    const lines = content.split('\n')
-    const max_line_number = lines.length
-    const padding = max_line_number.toString().length
-
-    return lines
-      .map((line, index) => {
-        const line_number = (index + 1).toString().padStart(padding, ' ')
-        return `${line_number} ${line}`
-      })
-      .join('\n')
-  }
-
   private get_workspace_root_for_file(file_path: string): string | undefined {
     return this.workspace_provider.get_workspace_root_for_file(file_path)
   }

packages/vscode/src/view/backend/message-handlers/handle-copy-prompt.ts

@@ -52,8 +52,7 @@ export const handle_copy_prompt = async (
   } else if (!provider.is_code_completions_mode) {
     const active_path = active_editor?.document.uri.fsPath
     const context_text = await files_collector.collect_files({
-      active_path,
-      with_line_numbers: provider.edit_format == 'diff'
+      active_path
     })
 
     let instructions = replace_selection_placeholder(current_instruction)

packages/vscode/src/view/backend/message-handlers/handle-preview-preset.ts

@@ -54,8 +54,7 @@ export const handle_preview_preset = async (
     text_to_send = `${instructions}\n<files>\n${context_text}<file path="${relative_path}">\n<![CDATA[\n${text_before_cursor}<missing text>${text_after_cursor}\n]]>\n</file>\n</files>\n${instructions}`
   } else if (!provider.is_code_completions_mode) {
     const context_text = await files_collector.collect_files({
-      active_path,
-      with_line_numbers: provider.edit_format == 'diff'
+      active_path
     })
 
     let instructions = replace_selection_placeholder(current_instructions)

packages/vscode/src/view/backend/message-handlers/handle-send-prompt.ts

@@ -67,8 +67,7 @@ export const handle_send_prompt = async (
     if (!provider.instructions) return
 
     const context_text = await files_collector.collect_files({
-      active_path,
-      with_line_numbers: provider.edit_format == 'diff'
+      active_path
     })
 
     let instructions = provider.instructions