Refactor and consolidate edit format utilities into a unified directory structure

Author: robertpiosik

apps/editor/src/commands/apply-chat-response-command/handlers/conflict-markers-handler.ts

@@ -7,10 +7,8 @@ import { create_safe_path, sanitize_file_name } from '@/utils/path-sanitizer'
 import { FileItem } from '../utils/clipboard-parser'
 import { OriginalFileState } from '../types/original-file-state'
 import { remove_directory_if_empty } from '../utils/file-operations'
-import {
-  apply_conflict_markers_to_content,
-  parse_conflict_segments
-} from '../utils/conflict-marker-parser'
+import { apply_conflict_markers_to_content } from '../utils/edit-formats/conflict-markers/apply-conflict-markers-to-content'
+import { parse_conflict_segments } from '../utils/edit-formats/conflict-markers'
 
 export const handle_conflict_markers = async (
   files: FileItem[]

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

@@ -6,7 +6,7 @@ import { Logger } from '@shared/utils/logger'
 import { promisify } from 'util'
 import { OriginalFileState } from '../types/original-file-state'
 import { create_safe_path } from '@/utils/path-sanitizer'
-import { apply_diff } from '../utils/diff-processor'
+import { apply_diff } from '../utils/edit-formats/diffs'
 import { remove_directory_if_empty } from '../utils/file-operations'
 
 const execAsync = promisify(exec)

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

@@ -6,21 +6,7 @@ import { dictionary } from '@shared/constants/dictionary'
 import { create_safe_path, sanitize_file_name } from '@/utils/path-sanitizer'
 import { FileItem } from '../utils/clipboard-parser'
 import { OriginalFileState } from '../types/original-file-state'
-
-/*
- * Matches lines like:
- * // ...
- * # ...
- * <!-- ...
- * ; ...
- * " ...
- * ' ...
- * {/* ...
- * /* ...
- */
-const TRUNCATION_REGEX = /^\s*(\/\/|#|<!--|;|"|'|\{\/\*|\/\*)\s*\.{3,}.*\s*$/
-
-export const is_truncation_line = (line: string) => TRUNCATION_REGEX.test(line)
+import { process_truncated_content } from '../utils/edit-formats/truncations'
 
 export const handle_truncated_edit = async (
   files: FileItem[]
@@ -126,154 +112,3 @@ export const handle_truncated_edit = async (
 
   return { success: true, original_states, failed_files }
 }
-
-const process_truncated_content = (
-  new_text: string,
-  original_text: string
-): string => {
-  const new_lines = new_text.split(/\r?\n/)
-  const original_lines = original_text.split(/\r?\n/)
-
-  const blocks: { type: 'code' | 'truncation'; lines: string[] }[] = []
-  let buffer: string[] = []
-
-  for (const line of new_lines) {
-    if (is_truncation_line(line)) {
-      if (buffer.length > 0) {
-        blocks.push({ type: 'code', lines: buffer })
-        buffer = []
-      }
-      blocks.push({ type: 'truncation', lines: [line] })
-    } else {
-      buffer.push(line)
-    }
-  }
-  if (buffer.length > 0) {
-    blocks.push({ type: 'code', lines: buffer })
-  }
-
-  const output_lines: string[] = []
-  let current_original_idx = 0 // Line index in original
-
-  for (let i = 0; i < blocks.length; i++) {
-    const block = blocks[i]
-
-    if (block.type == 'code') {
-      output_lines.push(...block.lines)
-
-      // Try to sync with original to handle replacements (context consumption)
-      // We look for a suffix of this block in the original file.
-      // If found, we advance current_original_idx to the end of that match.
-      // This allows the block to "consume" original code, avoiding duplication.
-
-      const search_window_size = 10
-      const suffix_lines = block.lines.slice(-search_window_size)
-
-      // Heuristic: Find the first occurrence of this suffix in Original after current_original_idx
-      let found_match = false
-      let match_end_idx = -1
-
-      // Try finding the largest possible suffix that matches
-      for (let len = suffix_lines.length; len >= 1; len--) {
-        const sub_suffix = suffix_lines.slice(suffix_lines.length - len)
-        // Find this sequence of lines in original_lines starting at current_original_idx
-        const idx = find_line_sequence(
-          original_lines,
-          sub_suffix,
-          current_original_idx
-        )
-        if (idx !== -1) {
-          found_match = true
-          match_end_idx = idx + len
-          break
-        }
-      }
-
-      if (found_match) {
-        current_original_idx = match_end_idx
-      }
-    } else {
-      // Truncation block
-      // We need to fill from current_original_idx up to the start of the Next Block.
-
-      let fill_end_idx = original_lines.length
-
-      if (i + 1 < blocks.length) {
-        const next_block = blocks[i + 1]
-        if (next_block.type == 'code') {
-          // Find where the next block starts in original
-          const prefix_lines = next_block.lines.slice(0, 10)
-          let found_next = false
-
-          for (let len = prefix_lines.length; len >= 1; len--) {
-            const sub_prefix = prefix_lines.slice(0, len)
-            const idx = find_line_sequence(
-              original_lines,
-              sub_prefix,
-              current_original_idx
-            )
-            if (idx !== -1) {
-              fill_end_idx = idx
-              found_next = true
-              break
-            }
-          }
-
-          if (!found_next) {
-            fill_end_idx = original_lines.length
-          }
-        }
-      }
-
-      // Append original content
-      if (fill_end_idx > current_original_idx) {
-        output_lines.push(
-          ...original_lines.slice(current_original_idx, fill_end_idx)
-        )
-      }
-      current_original_idx = fill_end_idx
-    }
-  }
-
-  const result = output_lines.join('\n')
-
-  if (original_text.endsWith('\n') && !result.endsWith('\n')) {
-    return result + '\n'
-  }
-
-  return result
-}
-
-const find_line_sequence = (
-  lines: string[],
-  sequence: string[],
-  start_idx: number
-): number => {
-  if (sequence.length == 0) return -1
-  if (start_idx >= lines.length) return -1
-
-  // First pass: exact match (checking for correct indentation)
-  for (let i = start_idx; i <= lines.length - sequence.length; i++) {
-    let match = true
-    for (let j = 0; j < sequence.length; j++) {
-      if (lines[i + j] != sequence[j]) {
-        match = false
-        break
-      }
-    }
-    if (match) return i
-  }
-
-  // Second pass: loose match (trim)
-  for (let i = start_idx; i <= lines.length - sequence.length; i++) {
-    let match = true
-    for (let j = 0; j < sequence.length; j++) {
-      if (lines[i + j].trim() != sequence[j].trim()) {
-        match = false
-        break
-      }
-    }
-    if (match) return i
-  }
-  return -1
-}

apps/editor/src/commands/apply-chat-response-command/utils/conflict-marker-parser/conflict-marker-parser.spec.ts

@@ -0,0 +1,55 @@
+import * as fs from 'fs'
+import * as path from 'path'
+import { apply_conflict_markers_to_content } from './apply-conflict-markers-to-content'
+
+describe('conflict-marker-parser', () => {
+  const load_test_case_file = (test_case: string, filename: string): string => {
+    return fs.readFileSync(
+      path.join(__dirname, 'test-cases', test_case, filename),
+      'utf-8'
+    )
+  }
+
+  const run_test_case = (test_case: string) => {
+    const original_content = load_test_case_file(test_case, 'original.txt')
+    const markers_content = load_test_case_file(test_case, 'markers.txt')
+    const expected_content = load_test_case_file(test_case, 'expected.txt')
+
+    const result = apply_conflict_markers_to_content({
+      original_content,
+      markers_content
+    })
+
+    expect(result).toBe(expected_content)
+  }
+
+  describe('apply_conflict_markers_to_content', () => {
+    it('applies a basic conflict marker correctly', () => {
+      run_test_case('basic-conflict')
+    })
+
+    it('applies multiple conflict markers in a single file', () => {
+      run_test_case('multiple-conflicts')
+    })
+
+    it('handles deletions via empty updated blocks', () => {
+      run_test_case('deletion')
+    })
+
+    it('throws an error when context cannot be found', () => {
+      const original_content = 'Some random text'
+      const markers_content = '<<<<<<<\nMissing\n=======\nFound\n>>>>>>>'
+
+      expect(() =>
+        apply_conflict_markers_to_content({
+          original_content,
+          markers_content
+        })
+      ).toThrow(/Could not find content to replace/)
+    })
+
+    it('handles whitespace issues in conflict markers', () => {
+      run_test_case('whitespace-issues')
+    })
+  })
+})