Standardize selected text formatting in chat instructions using file path and triple backticks

Author: robertpiosik

packages/vscode/src/commands/chat-commands.ts

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode'
 import { FilesCollector } from '../helpers/files-collector'
 import { WebSocketManager } from '../services/websocket-manager'
+import { replace_selection_placeholder } from '../utils/replace-selection-placeholder'
 import { apply_preset_affixes_to_instruction } from '../helpers/apply-preset-affixes'
 import { EditFormat } from '@shared/types/edit-format'
 
@@ -42,8 +43,12 @@ async function handle_chat_command(
     : ''
 
   if (editor && !editor.selection.isEmpty) {
-    const selected_text = editor.document.getText(editor.selection)
-    instructions = `\`${current_file_path}\`\n\`\`\`\n${selected_text}\n\`\`\`\n${instructions}`
+    if (instructions.includes('@selection')) {
+      instructions = replace_selection_placeholder(instructions)
+    } else {
+      const selected_text = editor.document.getText(editor.selection)
+      instructions = `\`${current_file_path}\`\n\`\`\`\n${selected_text}\n\`\`\`\n${instructions}`
+    }
   }
 
   const files_collector = new FilesCollector(
@@ -143,8 +148,12 @@ export function chat_using_command(
 
     let processed_instructions = instructions
     if (editor && !editor.selection.isEmpty) {
-      const selected_text = editor.document.getText(editor.selection)
-      processed_instructions = `\`${current_file_path}\`\n\`\`\`\n${selected_text}\n\`\`\`\n${instructions}`
+      if (instructions.includes('@selection')) {
+        processed_instructions = replace_selection_placeholder(instructions)
+      } else {
+        const selected_text = editor.document.getText(editor.selection)
+        processed_instructions = `\`${current_file_path}\`\n\`\`\`\n${selected_text}\n\`\`\`\n${instructions}`
+      }
     }
 
     const config = vscode.workspace.getConfiguration('codeWebChat')

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

@@ -15,18 +15,10 @@ export const replace_selection_placeholder = (instruction: string): string => {
   }
 
   const selected_text = active_editor.document.getText(active_editor.selection)
+  const document = active_editor.document
+  const current_file_path = vscode.workspace.asRelativePath(document.uri)
 
-  // Check if the selected text is a single line
-  const is_single_line = !selected_text.includes('\n')
+  const replacement_text = `\n\`${current_file_path}\`\n\`\`\`\n${selected_text}\n\`\`\`\n`
 
-  if (is_single_line) {
-    // For single-line text, wrap with single backticks
-    return instruction.replace(/@selection/g, `\`${selected_text}\``)
-  } else {
-    // For multi-line text, wrap with triple backticks as before
-    return instruction.replace(
-      /@selection/g,
-      `\n\`\`\`\n${selected_text}\n\`\`\`\n`
-    )
-  }
+  return instruction.replace(/@selection/g, replacement_text)
 }