Refine file parsing logic to correctly handle empty code blocks and ensure that empty file content blocks are ignored

Author: robertpiosik

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

@@ -39,14 +39,10 @@ describe('clipboard-parser', () => {
         is_single_root_folder_workspace: true
       })
 
-      expect(result).toHaveLength(2)
+      expect(result).toHaveLength(1)
       expect(result[0]).toMatchObject({
-        file_path: 'src/index.ts',
-        content: load_test_case_file(test_case, '1-file.txt')
-      })
-      expect(result[1]).toMatchObject({
         file_path: 'src/hello.ts',
-        content: load_test_case_file(test_case, '2-file.txt')
+        content: load_test_case_file(test_case, '1-file.txt')
       })
     })
 
@@ -502,6 +498,25 @@ describe('clipboard-parser', () => {
         content: load_test_case_file(test_case, '1-file.txt')
       })
     })
+
+    it('handles path duplicated in empty code block', () => {
+      const test_case = 'path-duplicated-in-empty-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({
+        file_path: 'src/hello-world.ts',
+        content: load_test_case_file(test_case, '2-file.txt')
+      })
+    })
   })
 
   describe('parse_file_content_only', () => {

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

@@ -54,7 +54,7 @@ export const extract_workspace_and_path = (params: {
 
 export const has_real_code = (content: string): boolean => {
   if (content.trim() == '') {
-    return true
+    return false
   }
   const lines = content.split('\n')
   const non_comment_lines = lines.filter((line) => {

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

@@ -1,3 +1,4 @@
+// packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/multiple-files-parser.ts
 import { extract_path_from_line_of_code } from '@shared/utils/extract-path-from-line-of-code'
 import {
   FileItem,
@@ -354,14 +355,31 @@ export const parse_multiple_files = (params: {
           is_markdown_container_block = true
         }
       } else if (
-        trimmed_line == '```' &&
-        backtick_nesting_level == 1 &&
-        ((current_content.trim() == '' &&
+        trimmed_line === '```' &&
+        backtick_nesting_level === 1 &&
+        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() !== '')) &&
+        (() => {
+          for (let j = i + 1; j < lines.length; j++) {
+            const next_line = lines[j].trim()
+            if (next_line) return true
+          }
+          return false
+        })()
+      ) {
+        backtick_nesting_level++
+      } else if (
+        trimmed_line === '```' &&
+        backtick_nesting_level === 1 &&
+        (current_language === 'markdown' || current_language === 'md') &&
+        ((current_content.trim() === '' &&
           i > 0 &&
           lines[i - 1].trim() !== '') ||
-          ((current_language == 'markdown' || current_language == 'md') &&
-            i > 0 &&
-            (lines[i - 1].trim() == '' ||
+          (i > 0 &&
+            (lines[i - 1].trim() === '' ||
               (current_file_name.endsWith('.md') &&
                 lines[i - 1].trim().endsWith('```'))))) &&
         (() => {
@@ -372,9 +390,7 @@ export const parse_multiple_files = (params: {
           return false
         })()
       ) {
-        if (current_language == 'markdown' || current_language === 'md') {
-          is_markdown_container_block = true
-        }
+        is_markdown_container_block = true
         backtick_nesting_level++
       } else if (trimmed_line.endsWith('```')) {
         backtick_nesting_level--

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/empty-file/1-file.txt

@@ -0,0 +1 @@
+console.log("hello")

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/empty-file/2-file.txt

@@ -0,0 +1 @@
+Test

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

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

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

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