@@ -60,7 +60,8 @@ export const process_response = async (params: {
6060 const on_progress = ( progress : number ) => {
6161 params . prompt_view_provider . send_message ( {
6262 command : 'SHOW_PROGRESS' ,
63- title : t ( 'common.progress.preparing-preview' ) ,
63+ title : t ( 'common.progress.response-preview' ) ,
64+ subtitle : t ( 'command.apply-response.progress.applying-edits' ) ,
6465 progress
6566 } )
6667 }
@@ -302,53 +303,53 @@ export const process_response = async (params: {
302303 try {
303304 for ( let i = 0 ; i < total_patches ; i ++ ) {
304305 on_progress ( Math . round ( ( i / total_patches ) * 100 ) )
305- const patch = patches [ i ]
306- let workspace_path = default_workspace
306+ const patch = patches [ i ]
307+ let workspace_path = default_workspace
307308
308- if ( patch . workspace_name && workspace_map . has ( patch . workspace_name ) ) {
309- workspace_path = workspace_map . get ( patch . workspace_name ) !
310- }
309+ if ( patch . workspace_name && workspace_map . has ( patch . workspace_name ) ) {
310+ workspace_path = workspace_map . get ( patch . workspace_name ) !
311+ }
311312
312- const sanitized_patch_content = sanitize_patch_content (
313- patch . content ,
314- patch . workspace_name
315- )
316- const result = await apply_git_patch (
317- sanitized_patch_content ,
318- workspace_path ,
319- patch . workspace_name ,
320- patch
321- )
313+ const sanitized_patch_content = sanitize_patch_content (
314+ patch . content ,
315+ patch . workspace_name
316+ )
317+ const result = await apply_git_patch (
318+ sanitized_patch_content ,
319+ workspace_path ,
320+ patch . workspace_name ,
321+ patch
322+ )
322323
323- if ( result . success ) {
324- if ( result . diff_application_method && result . original_states ) {
325- for ( const state of result . original_states ) {
326- state . diff_application_method = result . diff_application_method
327- state . ai_content = sanitized_patch_content
324+ if ( result . success ) {
325+ if ( result . diff_application_method && result . original_states ) {
326+ for ( const state of result . original_states ) {
327+ state . diff_application_method = result . diff_application_method
328+ state . ai_content = sanitized_patch_content
329+ }
328330 }
329- }
330- if ( result . original_states ) {
331- all_original_states = all_original_states . concat (
332- result . original_states
333- )
334- applied_patches . push ( {
335- patch,
336- original_states : result . original_states ,
337- diff_application_method : result . diff_application_method
338- } )
339- }
340- } else {
341- if ( result . original_states ) {
342- for ( const state of result . original_states ) {
343- state . apply_failed = true
344- state . ai_content = sanitized_patch_content
331+ if ( result . original_states ) {
332+ all_original_states = all_original_states . concat (
333+ result . original_states
334+ )
335+ applied_patches . push ( {
336+ patch,
337+ original_states : result . original_states ,
338+ diff_application_method : result . diff_application_method
339+ } )
340+ }
341+ } else {
342+ if ( result . original_states ) {
343+ for ( const state of result . original_states ) {
344+ state . apply_failed = true
345+ state . ai_content = sanitized_patch_content
346+ }
347+ all_original_states = all_original_states . concat (
348+ result . original_states
349+ )
345350 }
346- all_original_states = all_original_states . concat (
347- result . original_states
348- )
349351 }
350352 }
351- }
352353
353354 if ( all_original_states . length > 0 ) {
354355 all_original_states =
@@ -430,72 +431,72 @@ export const process_response = async (params: {
430431 data : { success : result . success }
431432 } )
432433 } else if ( selected_mode_label == 'Truncated' ) {
433- const result = await handle_truncated_edit ( { files, on_progress } )
434- const successful_states = result . original_states || [ ]
435- const failed_files = result . failed_files || [ ]
436-
437- if ( failed_files . length > 0 ) {
438- const workspace_map = new Map < string , string > ( )
439- vscode . workspace . workspaceFolders ! . forEach ( ( folder ) => {
440- workspace_map . set ( folder . name , folder . uri . fsPath )
441- } )
442- const default_workspace =
443- vscode . workspace . workspaceFolders ! [ 0 ] . uri . fsPath
444-
445- failed_files . forEach ( ( file ) => {
446- successful_states . push (
447- create_failed_file_state ( {
448- file,
449- default_workspace,
450- workspace_map
451- } )
452- )
434+ const result = await handle_truncated_edit ( { files, on_progress } )
435+ const successful_states = result . original_states || [ ]
436+ const failed_files = result . failed_files || [ ]
437+
438+ if ( failed_files . length > 0 ) {
439+ const workspace_map = new Map < string , string > ( )
440+ vscode . workspace . workspaceFolders ! . forEach ( ( folder ) => {
441+ workspace_map . set ( folder . name , folder . uri . fsPath )
442+ } )
443+ const default_workspace =
444+ vscode . workspace . workspaceFolders ! [ 0 ] . uri . fsPath
445+
446+ failed_files . forEach ( ( file ) => {
447+ successful_states . push (
448+ create_failed_file_state ( {
449+ file,
450+ default_workspace,
451+ workspace_map
452+ } )
453+ )
454+ } )
455+ }
456+
457+ if ( successful_states . length > 0 ) {
458+ final_original_states = successful_states
459+ operation_success = true
460+ }
461+ Logger . info ( {
462+ function_name : 'process_response' ,
463+ message : 'Truncated handler finished.' ,
464+ data : { success : result . success }
453465 } )
454- }
466+ } else if ( selected_mode_label == 'Conflict markers' ) {
467+ const result = await handle_search_replace ( { files, on_progress } )
455468
456- if ( successful_states . length > 0 ) {
457- final_original_states = successful_states
458- operation_success = true
459- }
460- Logger . info ( {
461- function_name : 'process_response' ,
462- message : 'Truncated handler finished.' ,
463- data : { success : result . success }
464- } )
465- } else if ( selected_mode_label == 'Conflict markers' ) {
466- const result = await handle_search_replace ( { files, on_progress } )
469+ const successful_states = result . original_states || [ ]
470+ const failed_files : FileItem [ ] = result . failed_files || [ ]
467471
468- const successful_states = result . original_states || [ ]
469- const failed_files : FileItem [ ] = result . failed_files || [ ]
472+ if ( failed_files . length > 0 ) {
473+ const workspace_map = new Map < string , string > ( )
474+ vscode . workspace . workspaceFolders ! . forEach ( ( folder ) => {
475+ workspace_map . set ( folder . name , folder . uri . fsPath )
476+ } )
477+ const default_workspace =
478+ vscode . workspace . workspaceFolders ! [ 0 ] . uri . fsPath
479+
480+ failed_files . forEach ( ( file ) => {
481+ successful_states . push (
482+ create_failed_file_state ( {
483+ file,
484+ default_workspace,
485+ workspace_map
486+ } )
487+ )
488+ } )
489+ }
470490
471- if ( failed_files . length > 0 ) {
472- const workspace_map = new Map < string , string > ( )
473- vscode . workspace . workspaceFolders ! . forEach ( ( folder ) => {
474- workspace_map . set ( folder . name , folder . uri . fsPath )
475- } )
476- const default_workspace =
477- vscode . workspace . workspaceFolders ! [ 0 ] . uri . fsPath
478-
479- failed_files . forEach ( ( file ) => {
480- successful_states . push (
481- create_failed_file_state ( {
482- file,
483- default_workspace,
484- workspace_map
485- } )
486- )
491+ if ( successful_states . length > 0 ) {
492+ final_original_states = successful_states
493+ operation_success = true
494+ }
495+ Logger . info ( {
496+ function_name : 'process_response' ,
497+ message : 'Conflict markers handler finished.' ,
498+ data : { success : result . success }
487499 } )
488- }
489-
490- if ( successful_states . length > 0 ) {
491- final_original_states = successful_states
492- operation_success = true
493- }
494- Logger . info ( {
495- function_name : 'process_response' ,
496- message : 'Conflict markers handler finished.' ,
497- data : { success : result . success }
498- } )
499500 } else {
500501 Logger . error ( {
501502 function_name : 'process_response' ,
0 commit comments