Modify prompt generation to incorporate selected text based on whether the @selection placeholder is present

Author: robertpiosik

packages/vscode/src/utils/replace-selection-placeholder/replace-selection-placeholder.ts

@@ -20,5 +20,5 @@ export const replace_selection_placeholder = (instruction: string): string => {
 
   const replacement_text = `\n\`${current_file_path}\`\n\`\`\`\n${selected_text}\n\`\`\`\n`
 
-  return instruction.replace(/@selection/g, replacement_text)
+  return instruction.replace(/\s*@selection\s*/g, replacement_text)
 }

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

@@ -71,13 +71,27 @@ export const handle_send_prompt = async (
   } else if (!provider.is_code_completions_mode) {
     if (!provider.instructions) return
 
+    const editor = vscode.window.activeTextEditor
+    const document = editor?.document
+    const current_file_path = document
+      ? vscode.workspace.asRelativePath(document.uri)
+      : ''
+
+    let base_instructions = provider.instructions
+
+    if (editor && !editor.selection.isEmpty) {
+      if (base_instructions.includes('@selection')) {
+        base_instructions = replace_selection_placeholder(base_instructions)
+      } else {
+        const selected_text = editor.document.getText(editor.selection)
+        base_instructions = `\`${current_file_path}\`\n\`\`\`\n${selected_text}\n\`\`\`\n${base_instructions}`
+      }
+    }
+
     const context_text = await files_collector.collect_files({
       active_path
     })
 
-    let base_instructions = provider.instructions
-    base_instructions = replace_selection_placeholder(base_instructions)
-
     const config = vscode.workspace.getConfiguration('codeWebChat')
     const edit_format_instructions = config.get<string>(
       `editFormatInstructions${