Refine clipboard parsing logic by simplifying regex patterns and ensuring file path hints are correctly handled across diff, completion, and multiple file parsers

Author: robertpiosik

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

@@ -24,7 +24,6 @@ const normalize_header_line = (params: {
 }): string => {
   const processed_line = params.line
     .replace(/\s+\d{4}-\d{2}-\d{2}.*$/, '')
-    .replace(/\t.*$/, '')
 
   if (processed_line.startsWith('--- ')) {
     let path_part = processed_line.substring(4).trim()

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

@@ -8,15 +8,14 @@ import {
 const extract_path_and_position = (
   line: string
 ): { path: string; line: number; character: number } | null => {
-  const path_pos_regex =
-    /(?:\/\/|#|--|<!--)\s*"?([^"<>\s?*|:]+)"?\s+(\d+):(\d+)|(?:\/\*)\s*"?([^"<>\s?*|:]+)"?\s+(\d+):(\d+)|\*\s*"?([^"<>\s?*|:]+)"?\s+(\d+):(\d+)/
+  const path_pos_regex = /\/\/\s*"?([^"<>\s?*|:]+)"?\s+(\d+):(\d+)/
 
   const match = line.match(path_pos_regex)
 
   if (match) {
-    const path = match[1] || match[4] || match[7]
-    const line_num_str = match[2] || match[5] || match[8]
-    const char_num_str = match[3] || match[6] || match[9]
+    const path = match[1]
+    const line_num_str = match[2]
+    const char_num_str = match[3]
 
     if (path && line_num_str && char_num_str) {
       return {

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

@@ -64,13 +64,6 @@ export const parse_multiple_files = (params: {
 
         if (!extracted_filename) {
           current_text_block += before_backticks
-        } else {
-          // A filename was extracted. Only add to text block if there's other text.
-          const trimmed = before_backticks.trim()
-          // If it doesn't start with a known comment marker, assume it's text.
-          if (!/^\s*(<!--|#|\/\/|\/\*|--)/.test(trimmed)) {
-            current_text_block += before_backticks
-          }
         }
 
         if (current_text_block.trim()) {
@@ -244,12 +237,6 @@ export const parse_multiple_files = (params: {
         }
         current_text_block = ''
         last_seen_file_path_comment = extracted_filename
-
-        const trimmed = line.trim()
-        // If it doesn't start with a known comment marker, assume it's text.
-        if (!/^\s*(<!--|#|\/\/|\/\*|--)/.test(trimmed)) {
-          current_text_block += line + '\n'
-        }
       } else {
         // Check if this line is a plain file path followed by a code block
         if (!last_seen_file_path_comment) {