Improve clipboard parsing logic to correctly extract file paths from various markdown and XML formats, especially when processing code blocks and surrounding text

Author: robertpiosik

packages/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "gemini-coder",
   "displayName": "Code Web Chat",
   "description": "Superfast AI coding (CWC)",
-  "version": "1.625.0",
+  "version": "1.626.0",
   "scripts": {
     "build": "npx vsce package --no-dependencies",
     "vscode:prepublish": "rimraf out && npm run compile",

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

@@ -41,6 +41,22 @@ const is_valid_file_path = (potential_path: string): boolean => {
 const extract_path_from_potential_string = (line: string) => {
   let extracted = extract_path_from_line_of_code(line)
 
+  if (!extracted) {
+    const xml_match = line.match(/^<[^>]+>([^<]+)<\/[^>]+>$/)
+    if (xml_match && xml_match[1]) {
+      const potential_path = xml_match[1].trim()
+      if (
+        potential_path &&
+        (potential_path.includes('/') ||
+          potential_path.includes('\\') ||
+          potential_path.includes('.')) &&
+        !potential_path.includes(' ')
+      ) {
+        extracted = potential_path
+      }
+    }
+  }
+
   if (!extracted) {
     let potential_path = line
     if (potential_path.endsWith(':')) {
@@ -125,21 +141,11 @@ const find_file_path_before_block = (params: {
         continue
       }
 
-      let all_intermediate_lines_empty = true
-      for (let k = j + 1; k < params.block_start; k++) {
-        if (params.lines[k].trim() !== '') {
-          all_intermediate_lines_empty = false
-          break
-        }
-      }
-
-      if (all_intermediate_lines_empty) {
-        const { workspace_name } = extract_workspace_and_path({
-          raw_file_path: extracted,
-          is_single_root_folder_workspace: params.is_single_root
-        })
-        return { file_path: extracted, workspace_name }
-      }
+      const { workspace_name } = extract_workspace_and_path({
+        raw_file_path: extracted,
+        is_single_root_folder_workspace: params.is_single_root
+      })
+      return { file_path: extracted, workspace_name }
     }
   }
 
@@ -687,39 +693,14 @@ const extract_all_code_block_patches = (params: {
       if (patch) {
         const last_item = items.length > 0 ? items[items.length - 1] : undefined
         if (last_item && last_item.type == 'text') {
-          const content_lines = last_item.content.split('\n')
-          let last_non_empty_line_index = -1
-          let last_non_empty_line = ''
-          for (let i = content_lines.length - 1; i >= 0; i--) {
-            if (content_lines[i].trim() !== '') {
-              last_non_empty_line_index = i
-              last_non_empty_line = content_lines[i].trim()
-              break
-            }
-          }
+          remove_path_line_from_text_block({
+            text_item: last_item,
+            target_file_path: patch.file_path,
+            is_single_root: params.is_single_root
+          })
 
-          if (last_non_empty_line) {
-            const extracted =
-              extract_path_with_xml_fallback(last_non_empty_line)
-
-            if (extracted) {
-              const { relative_path } = extract_workspace_and_path({
-                raw_file_path: extracted,
-                is_single_root_folder_workspace: params.is_single_root
-              })
-              if (relative_path === patch.file_path) {
-                const new_content = content_lines
-                  .slice(0, last_non_empty_line_index)
-                  .join('\n')
-                  .trim()
-
-                if (new_content) {
-                  last_item.content = new_content
-                } else {
-                  items.pop()
-                }
-              }
-            }
+          if (!last_item.content) {
+            items.pop()
           }
         }
 

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-mix-new-file-from-heading-and-diff/1-text.txt

@@ -1 +1,3 @@
+Lorem ipsum.
+
 Lorem ipsum.

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/diff-mix-new-file-from-heading-and-diff/diff-mix-new-file-from-heading-and-diff.txt

@@ -1,6 +1,8 @@
 Lorem ipsum.
 
-### New file: `src/lorem.html`
+### New file: `src/lorem.html` (Nuovo File)
+
+Lorem ipsum.
 
 ```html
 <div>lorem ipsum</div>