@@ -14,7 +14,7 @@ import {
1414import { apply_conflict_markers_to_content } from '../utils/edit-formats/conflict-markers/apply-conflict-markers-to-content'
1515import { parse_conflict_segments } from '../utils/edit-formats/conflict-markers/parse-conflict-segments'
1616
17- export const handle_conflict_markers = async ( params : {
17+ export const handle_search_replace = async ( params : {
1818 files : FileItem [ ]
1919 on_progress : ( progress : number ) => void
2020} ) : Promise < {
@@ -23,7 +23,7 @@ export const handle_conflict_markers = async (params: {
2323 failed_files ?: FileItem [ ]
2424} > => {
2525 Logger . info ( {
26- function_name : 'handle_conflict_markers ' ,
26+ function_name : 'handle_search_replace ' ,
2727 message : 'start' ,
2828 data : { file_count : params . files . length }
2929 } )
@@ -61,7 +61,7 @@ export const handle_conflict_markers = async (params: {
6161
6262 if ( ! safe_path ) {
6363 Logger . warn ( {
64- function_name : 'handle_conflict_markers ' ,
64+ function_name : 'handle_search_replace ' ,
6565 message : 'Unsafe file path detected' ,
6666 data : file . file_path
6767 } )
@@ -75,7 +75,7 @@ export const handle_conflict_markers = async (params: {
7575 workspace_root,
7676 workspace_map,
7777 default_workspace,
78- function_name : 'handle_conflict_markers '
78+ function_name : 'handle_search_replace '
7979 } )
8080 if ( delete_result . success && delete_result . original_state ) {
8181 original_states . push ( delete_result . original_state )
@@ -168,13 +168,13 @@ export const handle_conflict_markers = async (params: {
168168 } )
169169
170170 Logger . info ( {
171- function_name : 'handle_conflict_markers ' ,
171+ function_name : 'handle_search_replace ' ,
172172 message : 'Applied conflict markers edit to file' ,
173173 data : safe_path
174174 } )
175175 } catch ( error : any ) {
176176 Logger . error ( {
177- function_name : 'handle_conflict_markers ' ,
177+ function_name : 'handle_search_replace ' ,
178178 message : 'Failed to apply conflict markers edit' ,
179179 data : { file_path : safe_path , error }
180180 } )
@@ -244,7 +244,7 @@ export const handle_conflict_markers = async (params: {
244244 } )
245245 } catch ( error : any ) {
246246 Logger . error ( {
247- function_name : 'handle_conflict_markers ' ,
247+ function_name : 'handle_search_replace ' ,
248248 message : 'Error replacing file content (fallback)' ,
249249 data : { error, file_path : safe_path }
250250 } )
@@ -256,7 +256,7 @@ export const handle_conflict_markers = async (params: {
256256 return { success : true , original_states, failed_files }
257257 } catch ( error : any ) {
258258 Logger . error ( {
259- function_name : 'handle_conflict_markers ' ,
259+ function_name : 'handle_search_replace ' ,
260260 message : 'Error during conflict markers edit' ,
261261 data : error
262262 } )
0 commit comments