Enhance parse_multiple_files to correctly identify and extract file paths enclosed within a code block that immediately precedes the content code block

Author: robertpiosik

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.spec.ts

@@ -598,6 +598,26 @@ describe('clipboard-parser', () => {
       })
     })
 
+    it('parses file path from a code block preceding a content code block', () => {
+      const test_case = 'path-above-code-block-enclosed-in-code-block'
+      const text = load_test_case_file(test_case, `${test_case}.txt`)
+      const result = parse_multiple_files({
+        response: text,
+        is_single_root_folder_workspace: true
+      })
+
+      expect(result).toHaveLength(2)
+      expect(result[0]).toMatchObject({
+        type: 'text',
+        content: load_test_case_file(test_case, '1-text.txt')
+      })
+      expect(result[1]).toMatchObject({
+        type: 'file',
+        file_path: 'src/hello-world.ts',
+        content: load_test_case_file(test_case, '2-file.txt')
+      })
+    })
+
     it('extracts file path from backticks when there are no intermediate lines before code block', () => {
       const test_case = 'path-in-backticks-no-intermediate-empty-lines'
       const text = load_test_case_file(test_case, `${test_case}.txt`)

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

@@ -436,8 +436,7 @@ export const parse_multiple_files = (params: {
         current_content.trim() === '' &&
         i > 0 &&
         lines[i - 1].trim() !== '' &&
-        (extract_path_from_line_of_code(lines[i - 1]) === null ||
-          (i + 1 < lines.length && lines[i + 1].trim() !== '')) &&
+        lines[i - 1].trim().startsWith('```') &&
         (() => {
           for (let j = i + 1; j < lines.length; j++) {
             const next_line = lines[j].trim()
@@ -469,12 +468,25 @@ export const parse_multiple_files = (params: {
         is_markdown_container_block = true
         backtick_nesting_level++
       } else if (trimmed_line.endsWith('```')) {
-        backtick_nesting_level--
+        let should_close = true
         if (
-          backtick_nesting_level == 1 &&
-          (current_language == 'markdown' || current_language == 'md')
+          trimmed_line === '```' &&
+          backtick_nesting_level === 1 &&
+          current_file_name &&
+          i + 1 < lines.length &&
+          lines[i + 1].trim() !== ''
         ) {
-          is_first_content_line = true
+          should_close = false
+        }
+
+        if (should_close) {
+          backtick_nesting_level--
+          if (
+            backtick_nesting_level == 1 &&
+            (current_language == 'markdown' || current_language == 'md')
+          ) {
+            is_first_content_line = true
+          }
         }
       }
 
@@ -515,6 +527,10 @@ export const parse_multiple_files = (params: {
           results.push({ type: 'text', content: raw_code_block })
         }
 
+        if (current_file_name && !current_content.trim()) {
+          last_seen_file_path_comment = current_file_name
+        }
+
         current_file_name = ''
         current_content = ''
         is_first_content_line = false
@@ -747,4 +763,4 @@ export const parse_multiple_files = (params: {
   }
 
   return merged_results
-}
+}

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/path-above-code-block-enclosed-in-code-block/1-text.txt

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

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/path-above-code-block-enclosed-in-code-block/2-file.txt

@@ -0,0 +1 @@
+console.log('Hello world!')

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/path-above-code-block-enclosed-in-code-block/path-above-code-block-enclosed-in-code-block.txt

@@ -0,0 +1,9 @@
+Lorem ipsum.
+
+```typescript
+src/hello-world.ts
+```
+
+```typescript
+console.log('Hello world!')
+```