Refactor edit format utilities into a new changes integration directory

- to make the logic more readable, extract utils to `apps/editor/src/utils/changes-integration/diff-processor/utils/...`
- move types to `apps/editor/src/utils/changes-integration/diff-processor/types.ts`
- make sure functions with more than 2 parameters accept params variable. don't destructure in bodies
- `apps/editor/src/utils/changes-integration/truncations-processor` should utilize 'utils' folder as well
- `apps/editor/src/utils/changes-integration/truncations-processor/utils/find-line-sequence.ts` should accept params variable, don't destructure in body

Author: robertpiosik

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

@@ -5,7 +5,7 @@ import { exec } from 'child_process'
 import { Logger } from '@shared/utils/logger'
 import { OriginalFileState } from '../types/original-file-state'
 import { create_safe_path } from '@/utils/path-sanitizer'
-import { apply_diff } from '../../../utils/edit-formats/diffs'
+import { apply_diff } from '../../../utils/changes-integration/diff-processor'
 import { remove_directory_if_empty } from '../utils/file-operations'
 import { DiffItem } from '../utils/response-parser'
 

apps/editor/src/commands/apply-response-command/handlers/search-replace-handler.ts

@@ -11,8 +11,8 @@ import {
   handle_deleted_file_item,
   get_rename_source_info
 } from '../utils/file-operations'
-import { apply_search_replace_to_content } from '../../../utils/edit-formats/search-replace/apply-search-replace-to-content'
-import { parse_search_replace_segments } from '../../../utils/edit-formats/search-replace/parse-search-replace-segments'
+import { apply_search_replace_to_content } from '../../../utils/changes-integration/search-replace-processor/apply-search-replace-to-content'
+import { parse_search_replace_segments } from '../../../utils/changes-integration/search-replace-processor/parse-search-replace-segments'
 
 export const handle_search_replace = async (params: {
   files: FileItem[]

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

@@ -6,7 +6,7 @@ import { dictionary } from '@shared/constants/dictionary'
 import { create_safe_path, sanitize_file_name } from '@/utils/path-sanitizer'
 import { FileItem } from '../utils/response-parser'
 import { OriginalFileState } from '../types/original-file-state'
-import { process_truncated_content } from '../../../utils/edit-formats/truncations'
+import { process_truncations } from '../../../utils/changes-integration/truncations-processor'
 import {
   cleanup_rename_source,
   handle_deleted_file_item,
@@ -100,7 +100,7 @@ export const handle_truncated_edit = async (params: {
       rename_source_workspace_root
     ) {
       try {
-        const new_content = process_truncated_content(
+        const new_content = process_truncations(
           file.content,
           rename_source_content
         )
@@ -153,7 +153,7 @@ export const handle_truncated_edit = async (params: {
           await fs.promises.mkdir(directory, { recursive: true })
         }
 
-        const new_content = process_truncated_content(file.content, '')
+        const new_content = process_truncations(file.content, '')
 
         await fs.promises.writeFile(safe_path, new_content, 'utf8')
 
@@ -179,10 +179,7 @@ export const handle_truncated_edit = async (params: {
     try {
       const document = await vscode.workspace.openTextDocument(safe_path)
       const original_content = document.getText()
-      const new_content = process_truncated_content(
-        file.content,
-        original_content
-      )
+      const new_content = process_truncations(file.content, original_content)
 
       const directory = path.dirname(safe_path)
       if (!fs.existsSync(directory)) {

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

@@ -28,13 +28,13 @@ import { handle_truncated_edit } from './handlers/truncated-handler'
 import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'
 import { natural_sort } from '@/utils/natural-sort'
 import { t } from '@/i18n'
-import { is_truncation_line } from '../../utils/edit-formats/truncations'
 import {
   RelevantFileInPreview,
   ItemInPreview
 } from '@shared/types/file-in-preview'
 import { PreviewDecision } from './utils/preview/types'
 import { set_response_preview_promise_resolve } from './utils/preview/preview'
+import { is_truncation_line } from '@/utils/changes-integration/truncations-processor/utils/is-truncation-line'
 
 export type PreviewData = {
   original_states: OriginalFileState[]

…dit-formats/diffs/diff-processor.spec.ts …on/diff-processor/diff-processor.spec.tsapps/editor/src/utils/edit-formats/diffs/diff-processor.spec.ts renamed to apps/editor/src/utils/changes-integration/diff-processor/diff-processor.spec.ts apps/editor/src/utils/edit-formats/diffs/diff-processor.spec.ts renamed to apps/editor/src/utils/changes-integration/diff-processor/diff-processor.spec.ts

@@ -0,0 +1,67 @@
+import { handle_empty_file } from './utils/empty-file-handler'
+import {
+  normalize_original_code,
+  normalize_patch_lines
+} from './utils/normalize'
+import { parse_patch_blocks } from './utils/parse-blocks'
+import { match_blocks } from './utils/match-blocks'
+import { apply_blocks } from './utils/apply-blocks'
+
+export const apply_diff = (params: {
+  original_code: string
+  diff_patch: string
+  use_strict_whitespace?: boolean
+}): string => {
+  const original_code_normalized = params.original_code.replace(/\r\n/g, '\n')
+
+  if (original_code_normalized.trim() == '') {
+    const empty_file_result = handle_empty_file(params.diff_patch)
+    if (empty_file_result !== null) {
+      return empty_file_result
+    }
+  }
+
+  const original_code_lines = original_code_normalized.split(/^/m)
+  const original_code_lines_normalized = normalize_original_code({
+    original_code_lines,
+    use_strict_whitespace: params.use_strict_whitespace
+  })
+
+  const patch_normalized = params.diff_patch.replace(/\r\n/g, '\n')
+  const patch_lines = patch_normalized.split('\n')
+  const { patch_lines_original, patch_lines_normalized } =
+    normalize_patch_lines({
+      patch_lines,
+      use_strict_whitespace: params.use_strict_whitespace
+    })
+
+  const search_replace_blocks = parse_patch_blocks({
+    patch_lines_normalized,
+    patch_lines_original
+  })
+
+  match_blocks({
+    search_replace_blocks,
+    original_code_lines_normalized
+  })
+
+  const invalid_blocks = search_replace_blocks.filter(
+    (block) => block.search_block_start_index == -2
+  )
+
+  if (invalid_blocks.length > 0) {
+    throw new Error(
+      `Failed to apply ${invalid_blocks.length} hunk(s). Aborting diff application for this file.`
+    )
+  }
+
+  const valid_blocks = search_replace_blocks
+  valid_blocks.sort(
+    (a, b) => b.search_block_start_index - a.search_block_start_index
+  )
+
+  return apply_blocks({
+    valid_blocks,
+    original_code_lines
+  })
+}