Refactor parse_multiple_files to correctly merge adjacent text blocks and ensure text content is properly trimmed when parsing chat responses

Author: robertpiosik

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

@@ -74,7 +74,11 @@ export const parse_multiple_files = (params: {
         }
 
         if (current_text_block.trim()) {
-          results.push({ type: 'text', content: current_text_block })
+          const content =
+            results.length == 0
+              ? current_text_block.trim()
+              : current_text_block.trimEnd()
+          results.push({ type: 'text', content })
         }
         current_text_block = ''
 
@@ -232,7 +236,11 @@ export const parse_multiple_files = (params: {
 
       if (extracted_filename) {
         if (current_text_block.trim()) {
-          results.push({ type: 'text', content: current_text_block.trim() })
+          const content =
+            results.length == 0
+              ? current_text_block.trim()
+              : current_text_block.trimEnd()
+          results.push({ type: 'text', content })
         }
         current_text_block = ''
         last_seen_file_path_comment = extracted_filename
@@ -421,13 +429,7 @@ export const parse_multiple_files = (params: {
             '```'
           ].join('\n')
 
-          const last_result =
-            results.length > 0 ? results[results.length - 1] : null
-          if (last_result && last_result.type == 'text') {
-            last_result.content += raw_code_block
-          } else {
-            results.push({ type: 'text', content: raw_code_block })
-          }
+          results.push({ type: 'text', content: raw_code_block })
         }
 
         current_file_name = ''
@@ -667,15 +669,31 @@ export const parse_multiple_files = (params: {
       }
     }
   } else if (state == 'TEXT' && current_text_block.trim()) {
-    results.push({ type: 'text', content: current_text_block.trim() })
+    const content =
+      results.length == 0
+        ? current_text_block.trim()
+        : current_text_block.trimEnd()
+    results.push({ type: 'text', content })
   }
 
-  // Trim text items at the end to ensure clean output
+  const merged_results: (FileItem | TextItem)[] = []
   for (const result of results) {
+    if (merged_results.length > 0) {
+      const last = merged_results[merged_results.length - 1]
+      if (last.type == 'text' && result.type == 'text') {
+        last.content += '\n' + result.content
+        continue
+      }
+    }
+    merged_results.push(result)
+  }
+
+  // Trim text items at the end to ensure clean output
+  for (const result of merged_results) {
     if (result.type == 'text') {
       result.content = result.content.trim()
     }
   }
 
-  return results
+  return merged_results
 }

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

@@ -1 +1,10 @@
-Bottom `test test`.
+The change is on line 415 where I modified:
+```typescript
+message={dictionary.warning_message.NOTHING_SELECTED_IN_CONTEXT}
+```
+to:
+```typescript
+message={dictionary.warning_message.NOTHING_SELECTED_IN_CONTEXT.replace('.', '')}
+```
+
+This removes the trailing period from the message when it's displayed in the tooltip, while keeping the original string unchanged in the dictionary.

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

@@ -24,4 +24,13 @@ console.log('some inline code');
 console.log('ipsum');
 ```
 
-Bottom `test test`.
+The change is on line 415 where I modified:
+```typescript
+message={dictionary.warning_message.NOTHING_SELECTED_IN_CONTEXT}
+```
+to:
+```typescript
+message={dictionary.warning_message.NOTHING_SELECTED_IN_CONTEXT.replace('.', '')}
+```
+
+This removes the trailing period from the message when it's displayed in the tooltip, while keeping the original string unchanged in the dictionary.