Optimize diff processor and adjust progress indicator visibility based on file count

Author: robertpiosik

apps/editor/src/commands/apply-chat-response-command/apply-chat-response-command.ts

@@ -131,21 +131,21 @@ export const apply_chat_response_command = (params: {
               is_single_root_folder_workspace
             })
 
-        const has_content_to_preview =
-          (args?.files_with_content && args.files_with_content.length > 0) ||
-          parsed_items.some(
-            (item) =>
-              item.type == 'diff' ||
-              item.type == 'file' ||
-              item.type == 'code-at-cursor'
-          )
-
-        if (has_content_to_preview) {
+        const file_count = args?.files_with_content
+          ? args.files_with_content.length
+          : parsed_items.filter(
+              (item) =>
+                item.type == 'diff' ||
+                item.type == 'file' ||
+                item.type == 'code-at-cursor'
+            ).length
+
+        if (file_count > 0) {
           params.panel_provider.send_message({
             command: 'SHOW_PROGRESS',
             title: 'Preparing response preview...',
             show_elapsed_time: false,
-            delay_visibility: true,
+            delay_visibility: file_count < 5,
             cancellable: false
           })
         }

apps/editor/src/commands/apply-chat-response-command/utils/diff-processor/diff-processor.spec.ts

@@ -70,5 +70,19 @@ describe('diff-processor', () => {
 
       expect(result).toBe(expected)
     })
+
+    it('applies diff with generic test case 2 correctly', async () => {
+      const test_case = 'generic-2'
+      const original = load_test_case_file('', test_case, 'original.txt')
+      const diff = load_test_case_file('', test_case, 'diff.txt')
+      const expected = load_test_case_file('', test_case, 'expected.txt')
+
+      const result = apply_diff({
+        original_code: original,
+        diff_patch: diff
+      })
+
+      expect(result).toBe(expected)
+    })
   })
 })

apps/editor/src/commands/apply-chat-response-command/utils/diff-processor/diff-processor.ts

@@ -10,6 +10,8 @@ class SearchBlock {
   public search_lines: string[]
   public replace_lines: ReplaceLine[]
   public search_block_start_index: number
+  public actual_original_line_count: number = 0
+  public search_to_original_map: Map<number, number> = new Map()
 
   public constructor(
     search_lines: string[],
@@ -25,7 +27,7 @@ class SearchBlock {
     return this.search_block_start_index
   }
   get_search_count() {
-    return this.search_lines.length
+    return this.actual_original_line_count || this.search_lines.length
   }
 }
 
@@ -61,12 +63,12 @@ export const apply_diff = (params: {
 }): string => {
   const original_code_normalized = params.original_code.replace(/\r\n/g, '\n')
   const original_code_lines = original_code_normalized.split(/^/m)
-  const original_code_lines_normalized = []
+  const original_code_lines_normalized: { key: number; value: string }[] = []
 
   const patch_normalized = params.diff_patch.replace(/\r\n/g, '\n')
   const patch_lines = patch_normalized.split('\n')
-  const patch_lines_original = []
-  const patch_lines_normalized = []
+  const patch_lines_original: string[] = []
+  const patch_lines_normalized: string[] = []
 
   let line_count = 0
   for (let i = 0; i < original_code_lines.length; i++) {
@@ -107,11 +109,11 @@ export const apply_diff = (params: {
       continue
     }
 
-    if (line.trim() == '') {
+    if (line.trim() === '') {
       line = '~nnn'
-    } else if (line.trim() == '+') {
+    } else if (line.trim() === '+') {
       line = '+~nnn'
-    } else if (line.trim() == '-') {
+    } else if (line.trim() === '-') {
       line = '-~nnn'
     }
 
@@ -149,39 +151,32 @@ export const apply_diff = (params: {
   let inside_replace_block = false
   let current_block_has_changes = false
 
+  const push_block = () => {
+    if (search_chunks.length > 0 || replace_chunks.length > 0) {
+      if (current_block_has_changes) {
+        search_replace_blocks.push(
+          new SearchBlock(search_chunks, replace_chunks, -1)
+        )
+      }
+    }
+    search_chunks = []
+    replace_chunks = []
+    inside_replace_block = false
+    current_block_has_changes = false
+  }
+
   for (let i = 0; i < patch_lines_normalized.length; i++) {
     const line = patch_lines_normalized[i]
     const line_original = patch_lines_original[i]
 
     if (line.startsWith('@@')) {
-      if (search_chunks.length > 0 || replace_chunks.length > 0) {
-        if (current_block_has_changes) {
-          search_replace_blocks.push(
-            new SearchBlock(search_chunks, replace_chunks, -1)
-          )
-        }
-      }
-      search_chunks = []
-      replace_chunks = []
-      inside_replace_block = false
-      current_block_has_changes = false
+      push_block()
+      continue
     }
 
     if (line.startsWith('-') || line.startsWith('~')) {
       if (inside_replace_block) {
-        inside_replace_block = false
-
-        if (search_chunks.length > 0 || replace_chunks.length > 0) {
-          if (current_block_has_changes) {
-            search_replace_blocks.push(
-              new SearchBlock(search_chunks, replace_chunks, -1)
-            )
-          }
-        }
-
-        search_chunks = []
-        replace_chunks = []
-        current_block_has_changes = false
+        push_block()
       }
 
       if (line.startsWith('-')) {
@@ -227,64 +222,72 @@ export const apply_diff = (params: {
     }
   }
 
-  if (search_chunks.length > 0) {
-    if (search_chunks[search_chunks.length - 1] == '~nnn') {
+  if (search_chunks.length > 0 || replace_chunks.length > 0) {
+    if (
+      search_chunks[search_chunks.length - 1] === '~nnn' &&
+      !inside_replace_block
+    ) {
       search_chunks.pop()
       replace_chunks.pop()
     }
-
-    if (search_chunks.length != 0 || replace_chunks.length != 0) {
-      if (current_block_has_changes) {
-        search_replace_blocks.push(
-          new SearchBlock(search_chunks, replace_chunks, -1)
-        )
-      }
-    }
+    push_block()
   }
 
   let previous_found_index = 0
   for (let i = 0; i < search_replace_blocks.length; i++) {
-    const search_replace_block = search_replace_blocks[i]
-    const search_string = search_replace_block.search_lines.join('')
+    const block = search_replace_blocks[i]
+
+    if (block.search_lines.length === 0 && previous_found_index === 0) {
+      block.search_block_start_index = -1
+      continue
+    }
 
     let found = false
     for (
       let j = previous_found_index;
       j < original_code_lines_normalized.length;
       j++
     ) {
-      if (
-        search_replace_block.search_lines.length == 0 &&
-        previous_found_index == 0
+      let search_ptr = 0
+      let original_ptr = j
+      const matched_indices: number[] = []
+      const current_search_to_original = new Map<number, number>()
+
+      while (
+        search_ptr < block.search_lines.length &&
+        original_ptr < original_code_lines_normalized.length
       ) {
-        search_replace_block.search_block_start_index = -1
-        found = true
-        break
-      } else {
-        const chunk = original_code_lines_normalized.slice(
-          j,
-          j + search_replace_block.search_lines.length
-        )
-
-        const chunk_string = chunk.map((line) => line.value).join('')
+        const s_val = block.search_lines[search_ptr]
+        const o_val = original_code_lines_normalized[original_ptr].value
 
-        if (chunk_string == search_string) {
-          if (previous_found_index > chunk[0].key) {
-            throw new Error('Found index is less than previous found index')
-          }
-
-          search_replace_block.search_block_start_index = chunk[0].key
-          found = true
-
-          previous_found_index =
-            chunk[0].key + search_replace_block.search_lines.length
+        if (s_val === o_val) {
+          current_search_to_original.set(
+            search_ptr,
+            original_code_lines_normalized[original_ptr].key
+          )
+          matched_indices.push(original_code_lines_normalized[original_ptr].key)
+          search_ptr++
+          original_ptr++
+        } else if (o_val === '~nnn') {
+          matched_indices.push(original_code_lines_normalized[original_ptr].key)
+          original_ptr++
+        } else {
           break
         }
       }
+
+      if (search_ptr === block.search_lines.length) {
+        block.search_block_start_index = matched_indices[0]
+        block.actual_original_line_count = matched_indices.length
+        block.search_to_original_map = current_search_to_original
+        found = true
+        previous_found_index = matched_indices[matched_indices.length - 1] + 1
+        break
+      }
     }
 
     if (!found) {
-      search_replace_block.search_block_start_index = -2
+      block.search_block_start_index = -2
     }
   }
 
@@ -297,37 +300,47 @@ export const apply_diff = (params: {
 
   for (const block of valid_blocks) {
     const start_index =
-      block.get_start_index() == -1 ? 0 : block.get_start_index()
-    const search_count = block.get_search_count()
-    const replacement_content = block.replace_lines.map((line) => {
-      if (
-        line.search_index !== null &&
-        start_index + line.search_index < original_code_lines.length
-      ) {
-        let originalContent =
-          original_code_lines[start_index + line.search_index]
-        if (!originalContent.endsWith('\n')) {
-          originalContent += '\n'
+      block.get_start_index() === -1 ? 0 : block.get_start_index()
+    const replacement_content: string[] = []
+    let last_original_idx = start_index - 1
+
+    for (const line of block.replace_lines) {
+      if (line.search_index !== null) {
+        const original_idx = block.search_to_original_map.get(line.search_index)
+        if (original_idx !== undefined) {
+          for (let skip = last_original_idx + 1; skip < original_idx; skip++) {
+            if (original_code_lines_normalized[skip].value === '~nnn') {
+              replacement_content.push(original_code_lines[skip])
+            }
+          }
+          let content = original_code_lines[original_idx]
+          if (
+            !content.endsWith('\n') &&
+            original_idx < original_code_lines.length - 1
+          )
+            content += '\n'
+          replacement_content.push(content)
+          last_original_idx = original_idx
         }
-        return originalContent
+      } else {
+        replacement_content.push(line.content)
       }
-      return line.content
-    })
-
-    if (start_index < 0 || start_index > result_lines.length) {
-      continue
     }
 
-    const actual_search_count = Math.min(
-      search_count,
-      result_lines.length - start_index
-    )
+    const end_original_idx = start_index + block.get_search_count() - 1
+    for (let skip = last_original_idx + 1; skip <= end_original_idx; skip++) {
+      if (original_code_lines_normalized[skip].value === '~nnn') {
+        replacement_content.push(original_code_lines[skip])
+      }
+    }
 
-    result_lines.splice(
-      start_index,
-      actual_search_count,
-      ...replacement_content
-    )
+    if (start_index >= 0 && start_index <= result_lines.length) {
+      result_lines.splice(
+        start_index,
+        block.get_search_count(),
+        ...replacement_content
+      )
+    }
   }
 
   return result_lines.join('')

apps/editor/src/commands/apply-chat-response-command/utils/diff-processor/test-cases/generic-2/diff.txt

@@ -0,0 +1,10 @@
+--- a/daemon.ts
++++ b/daemon.ts
+@@ -7,7 +7,7 @@
+ import FormData from 'form-data'
+ const CONFIG = {
+   API_URL: 'http://localhost:10008/api/v1',
+   STITCHER_PATH: path.resolve(__dirname),
+-  CHECK_INTERVAL: 60000 // 1 minute in milliseconds
++  CHECK_INTERVAL: 120000 // 2 minutes in milliseconds
+ }

apps/editor/src/commands/apply-chat-response-command/utils/diff-processor/test-cases/generic-2/expected.txt

@@ -0,0 +1,21 @@
+import axios from 'axios'
+import { execSync } from 'child_process'
+import * as fs from 'fs'
+import * as path from 'path'
+import * as os from 'os'
+import FormData from 'form-data'
+
+const CONFIG = {
+  API_URL: 'http://localhost:10008/api/v1',
+  STITCHER_PATH: path.resolve(__dirname),
+  CHECK_INTERVAL: 120000 // 2 minutes in milliseconds
+}
+
+interface UnstitchedImageResponse {
+  tour_id: string
+  scene_id: string
+  images: string[]
+  hugin_project?: string
+  processing_started_at: string
+  layer_name?: string
+}

apps/editor/src/commands/apply-chat-response-command/utils/diff-processor/test-cases/generic-2/original.txt

@@ -0,0 +1,21 @@
+import axios from 'axios'
+import { execSync } from 'child_process'
+import * as fs from 'fs'
+import * as path from 'path'
+import * as os from 'os'
+import FormData from 'form-data'
+
+const CONFIG = {
+  API_URL: 'http://localhost:10008/api/v1',
+  STITCHER_PATH: path.resolve(__dirname),
+  CHECK_INTERVAL: 60000 // 1 minute in milliseconds
+}
+
+interface UnstitchedImageResponse {
+  tour_id: string
+  scene_id: string
+  images: string[]
+  hugin_project?: string
+  processing_started_at: string
+  layer_name?: string
+}