Skip to content

Commit ca684b1

Browse files
committed
Rename context_file_paths to selected_files and update chat response processing and UI components
- because we will have more test cases for 'relevant files', place the current one in a folder 'standard' `apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/relevant-files/standard` - add test case relevant files > inline - place backticked paths one after another, use ', ' and ' ' as delimiters - `apps/editor/src/commands/apply-chat-response-command/utils/parse-relevant-files-from-response/parse-relevant-files-from-response.ts` should return response of type [Fragment] - to `apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.spec.ts`, add relevant files test cases - 'parse response' should accept optional param 'workspace_files'. If provided, should use 'relevant files parser' before all other parsers. - rename 'chat response' to response - rename identifiers 'context files' to 'selected files'
1 parent c757713 commit ca684b1

33 files changed

Lines changed: 2279 additions & 2437 deletions

File tree

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

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as vscode from 'vscode'
22
import * as fs from 'fs'
3+
import * as path from 'path'
34
import {
45
create_checkpoint,
56
delete_checkpoint
@@ -17,7 +18,7 @@ import {
1718
ongoing_preview_cleanup_promise
1819
} from './utils/preview-handler'
1920
import {
20-
process_chat_response,
21+
process_response,
2122
ApplyChatResponseCommandArgs
2223
} from './response-processor'
2324
import { CHECKPOINTS_STATE_KEY } from '@/constants/state-keys'
@@ -28,6 +29,7 @@ import {
2829
preview_document_provider,
2930
CwcPreviewProvider
3031
} from './utils/preview/virtual-document-provider'
32+
import { get_selected_files } from '@/context/get-selected-files'
3133
import { parse_response } from './utils/clipboard-parser'
3234
import { Checkpoint } from '@/features/checkpoints/types'
3335

@@ -67,16 +69,16 @@ export const apply_chat_response_command = (params: {
6769
return
6870
}
6971

70-
let chat_response = args?.response
71-
if (chat_response === undefined) {
72-
chat_response = await vscode.env.clipboard.readText()
73-
if (!chat_response) {
72+
let response = args?.response
73+
if (response === undefined) {
74+
response = await vscode.env.clipboard.readText()
75+
if (!response) {
7476
vscode.window.showInformationMessage(
7577
dictionary.information_message.CLIPBOARD_IS_EMPTY
7678
)
7779
return
7880
}
79-
} else if (!chat_response) {
81+
} else if (!response) {
8082
vscode.window.showErrorMessage(
8183
dictionary.error_message.RESPONSE_TEXT_MISSING
8284
)
@@ -92,9 +94,16 @@ export const apply_chat_response_command = (params: {
9294
const is_single_root_folder_workspace =
9395
(vscode.workspace.workspaceFolders?.length ?? 0) <= 1
9496

97+
const workspace_files = get_selected_files({
98+
workspace_provider: params.workspace_provider,
99+
shared_context_state: params.panel_provider.shared_context_state,
100+
include_all_path_variations: true
101+
})
102+
95103
const clipboard_items = parse_response({
96-
response: chat_response,
97-
is_single_root_folder_workspace
104+
response,
105+
is_single_root_folder_workspace,
106+
workspace_files
98107
})
99108

100109
if (resolve_fn) {
@@ -104,7 +113,7 @@ export const apply_chat_response_command = (params: {
104113

105114
if (!args?.created_at) {
106115
const new_item: ResponseHistoryItem = {
107-
response: chat_response,
116+
response,
108117
raw_instructions: args?.raw_instructions,
109118
created_at: Date.now(),
110119
url: args?.url,
@@ -215,9 +224,9 @@ export const apply_chat_response_command = (params: {
215224
})
216225
}
217226

218-
const preview_data = await process_chat_response({
227+
const preview_data = await process_response({
219228
args,
220-
chat_response,
229+
response,
221230
clipboard_items,
222231
context: params.context,
223232
panel_provider: params.panel_provider,
@@ -353,7 +362,7 @@ export const apply_chat_response_command = (params: {
353362
} else {
354363
created_at_for_preview = Date.now()
355364
const new_item: ResponseHistoryItem = {
356-
response: preview_data.chat_response,
365+
response: preview_data.response,
357366
raw_instructions: args?.raw_instructions,
358367
created_at: created_at_for_preview,
359368
lines_added: total_lines_added,
@@ -377,7 +386,7 @@ export const apply_chat_response_command = (params: {
377386
]
378387
const changes_accepted = await preview_handler({
379388
original_states: preview_data.original_states,
380-
chat_response: preview_data.chat_response,
389+
chat_response: preview_data.response,
381390
panel_provider: params.panel_provider,
382391
context: params.context,
383392
original_editor_state: args?.original_editor_state,

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import { set_response_preview_promise_resolve } from './utils/preview/preview'
4141

4242
export type PreviewData = {
4343
original_states: OriginalFileState[]
44-
chat_response: string
44+
response: string
4545
}
4646

4747
export type ApplyChatResponseCommandArgs = {
@@ -58,9 +58,9 @@ export type ApplyChatResponseCommandArgs = {
5858
recent_api_configuration?: RecentApiConfiguration
5959
}
6060

61-
export const process_chat_response = async (params: {
61+
export const process_response = async (params: {
6262
args: ApplyChatResponseCommandArgs | undefined
63-
chat_response: string
63+
response: string
6464
clipboard_items: ClipboardItem[]
6565
context: vscode.ExtensionContext
6666
panel_provider: PanelProvider
@@ -103,12 +103,12 @@ export const process_chat_response = async (params: {
103103
context: params.context,
104104
panel_provider: params.panel_provider,
105105
states: augmented_states,
106-
applied_content: params.chat_response,
106+
applied_content: params.response,
107107
original_editor_state: params.args?.original_editor_state
108108
})
109109
return {
110110
original_states: augmented_states,
111-
chat_response: params.chat_response
111+
response: params.response
112112
}
113113
}
114114
return null
@@ -206,7 +206,7 @@ export const process_chat_response = async (params: {
206206
const history = params.panel_provider.response_history
207207
if (!params.args?.created_at) {
208208
const new_item = {
209-
response: params.chat_response,
209+
response: params.response,
210210
raw_instructions: params.args?.raw_instructions,
211211
created_at: created_at_for_preview,
212212
relevant_files: files_for_preview,
@@ -418,7 +418,7 @@ export const process_chat_response = async (params: {
418418
context: params.context,
419419
panel_provider: params.panel_provider,
420420
states: all_original_states,
421-
applied_content: params.chat_response,
421+
applied_content: params.response,
422422
original_editor_state: params.args?.original_editor_state
423423
})
424424
}
@@ -434,7 +434,7 @@ export const process_chat_response = async (params: {
434434
.map((p) => p.patch.file_path)
435435

436436
Logger.info({
437-
function_name: 'process_chat_response',
437+
function_name: 'process_response',
438438
message: 'Patches applied with fallback method',
439439
data: {
440440
count: fallback_patches_count,
@@ -446,7 +446,7 @@ export const process_chat_response = async (params: {
446446
}
447447
return {
448448
original_states: all_original_states,
449-
chat_response: params.chat_response
449+
response: params.response
450450
}
451451
}
452452

@@ -474,7 +474,7 @@ export const process_chat_response = async (params: {
474474
dictionary.error_message.FILE_NOT_FOUND(completion.file_path)
475475
)
476476
Logger.warn({
477-
function_name: 'process_chat_response',
477+
function_name: 'process_response',
478478
message: 'File not found for code completion.',
479479
data: { file_path: completion.file_path, safe_path }
480480
})
@@ -557,7 +557,7 @@ export const process_chat_response = async (params: {
557557
.asRelativePath(document.uri, !is_single_root_folder_workspace)
558558
.replace(/\\/g, '/')
559559

560-
const markdown_response_for_active_editor = `\`\`\`\n// ${file_path_for_block}\n${params.chat_response}\n\`\`\``
560+
const markdown_response_for_active_editor = `\`\`\`\n// ${file_path_for_block}\n${params.response}\n\`\`\``
561561

562562
const model_providers_manager = new ModelProvidersManager(
563563
params.context
@@ -600,7 +600,7 @@ export const process_chat_response = async (params: {
600600

601601
return {
602602
original_states: intelligent_update_states,
603-
chat_response: markdown_response_for_active_editor
603+
response: markdown_response_for_active_editor
604604
}
605605
}
606606
return null
@@ -628,13 +628,13 @@ export const process_chat_response = async (params: {
628628
if (has_conflict_markers) {
629629
selected_mode_label = 'Conflict markers'
630630
Logger.info({
631-
function_name: 'process_chat_response',
631+
function_name: 'process_response',
632632
message: 'Selecting conflict markers mode.'
633633
})
634634
} else if (has_truncation_markers) {
635635
selected_mode_label = 'Truncated'
636636
Logger.info({
637-
function_name: 'process_chat_response',
637+
function_name: 'process_response',
638638
message: 'Selecting truncated edit mode.'
639639
})
640640
} else {
@@ -651,7 +651,7 @@ export const process_chat_response = async (params: {
651651
operation_success = true
652652
}
653653
Logger.info({
654-
function_name: 'process_chat_response',
654+
function_name: 'process_response',
655655
message: 'Fast replace handler finished.',
656656
data: { success: result.success }
657657
})
@@ -684,7 +684,7 @@ export const process_chat_response = async (params: {
684684
operation_success = true
685685
}
686686
Logger.info({
687-
function_name: 'process_chat_response',
687+
function_name: 'process_response',
688688
message: 'Truncated handler finished.',
689689
data: { success: result.success }
690690
})
@@ -718,13 +718,13 @@ export const process_chat_response = async (params: {
718718
operation_success = true
719719
}
720720
Logger.info({
721-
function_name: 'process_chat_response',
721+
function_name: 'process_response',
722722
message: 'Conflict markers handler finished.',
723723
data: { success: result.success }
724724
})
725725
} else {
726726
Logger.error({
727-
function_name: 'process_chat_response',
727+
function_name: 'process_response',
728728
message: 'No valid mode selected or determined.'
729729
})
730730
return null
@@ -735,13 +735,13 @@ export const process_chat_response = async (params: {
735735
context: params.context,
736736
panel_provider: params.panel_provider,
737737
states: final_original_states,
738-
applied_content: params.chat_response,
738+
applied_content: params.response,
739739
original_editor_state: params.args?.original_editor_state
740740
})
741741

742742
return {
743743
original_states: final_original_states,
744-
chat_response: params.chat_response
744+
response: params.response
745745
}
746746
} else {
747747
update_undo_button_state({
@@ -750,13 +750,13 @@ export const process_chat_response = async (params: {
750750
states: null
751751
})
752752
Logger.info({
753-
function_name: 'process_chat_response',
753+
function_name: 'process_response',
754754
message: 'Operation concluded without success.'
755755
})
756756
}
757757

758758
Logger.info({
759-
function_name: 'process_chat_response',
759+
function_name: 'process_response',
760760
message: 'end',
761761
data: {
762762
mode: selected_mode_label,

0 commit comments

Comments
 (0)