Skip to content

Commit 1612d47

Browse files
committed
Rename extension context parameters across codebase and integrate fork-ts-checker-webpack-plugin
- allow negating keyword "!", e.g. "![keyword]", which makes sure it doesn't appear in the file - is casing respected when using a keyword in double quotes? - prefer name 'extension_context' over 'context' - is this normal to see double logs? - when changing prompt type to 'find relevant files' - should not focus prompt field
1 parent 2339817 commit 1612d47

106 files changed

Lines changed: 826 additions & 591 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/editor/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,6 +1239,7 @@
12391239
"eslint": "^8.57.1",
12401240
"eslint-config-prettier": "^10.1.5",
12411241
"eslint-plugin-react": "^7.37.5",
1242+
"fork-ts-checker-webpack-plugin": "^9.0.2",
12421243
"mini-css-extract-plugin": "^2.9.2",
12431244
"sass-embedded": "^1.89.2",
12441245
"sass-loader": "^12.6.0",

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ interface SavedTabGroups {
4646
}
4747

4848
export const apply_response_command = (params: {
49-
context: vscode.ExtensionContext
49+
extension_context: vscode.ExtensionContext
5050
panel_provider: PanelProvider
5151
workspace_provider: WorkspaceProvider
5252
api_manager: ApiManager
5353
}) => {
54-
params.context.subscriptions.push(
54+
params.extension_context.subscriptions.push(
5555
vscode.workspace.registerTextDocumentContentProvider(
5656
CwcPreviewProvider.scheme,
5757
preview_document_provider
@@ -214,7 +214,7 @@ export const apply_response_command = (params: {
214214

215215
before_checkpoint = await create_checkpoint({
216216
workspace_provider: params.workspace_provider,
217-
context: params.context,
217+
extension_context: params.extension_context,
218218
panel_provider: params.panel_provider,
219219
trigger: 'before-response-previewed',
220220
description: args?.raw_instructions
@@ -225,7 +225,7 @@ export const apply_response_command = (params: {
225225
args,
226226
response,
227227
response_items,
228-
context: params.context,
228+
extension_context: params.extension_context,
229229
panel_provider: params.panel_provider,
230230
workspace_provider: params.workspace_provider
231231
})
@@ -385,7 +385,7 @@ export const apply_response_command = (params: {
385385
original_states: preview_data.original_states,
386386
chat_response: preview_data.response,
387387
panel_provider: params.panel_provider,
388-
context: params.context,
388+
extension_context: params.extension_context,
389389
original_editor_state: args?.original_editor_state,
390390
raw_instructions: args?.raw_instructions,
391391
created_at: created_at_for_preview,
@@ -397,7 +397,7 @@ export const apply_response_command = (params: {
397397
params.api_manager.cancel_all_requests()
398398
if (before_checkpoint) {
399399
const checkpoints =
400-
params.context.workspaceState.get<Checkpoint[]>(
400+
params.extension_context.workspaceState.get<Checkpoint[]>(
401401
CHECKPOINTS_STATE_KEY,
402402
[]
403403
) ?? []
@@ -429,7 +429,7 @@ export const apply_response_command = (params: {
429429

430430
checkpoints.sort((a, b) => b.timestamp - a.timestamp)
431431

432-
await params.context.workspaceState.update(
432+
await params.extension_context.workspaceState.update(
433433
CHECKPOINTS_STATE_KEY,
434434
checkpoints
435435
)
@@ -452,7 +452,7 @@ export const apply_response_command = (params: {
452452
in_progress = false
453453
if (before_checkpoint) {
454454
delete_checkpoint({
455-
context: params.context,
455+
context: params.extension_context,
456456
panel_provider: params.panel_provider,
457457
checkpoint_to_delete: before_checkpoint
458458
})

‎apps/editor/src/commands/apply-response-command/handlers/active-editor-intelligent-update-handler.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const handle_active_editor_intelligent_update = async (params: {
2424
api_key: string
2525
api_configuration: ApiConfiguration
2626
chat_response: string
27-
context: vscode.ExtensionContext
27+
extension_context: vscode.ExtensionContext
2828
is_single_root_folder_workspace: boolean
2929
panel_provider?: PanelProvider
3030
}): Promise<OriginalFileState[] | null> => {
@@ -199,11 +199,13 @@ export const handle_active_editor_intelligent_update = async (params: {
199199
dictionary.error_message.ERROR_APPLYING_CHANGES(error.message)
200200
)
201201

202-
const model_providers_manager = new ModelProvidersManager(params.context)
202+
const model_providers_manager = new ModelProvidersManager(
203+
params.extension_context
204+
)
203205
const api_configuration_result = await get_intelligent_update_config(
204206
model_providers_manager,
205207
true,
206-
params.context
208+
params.extension_context
207209
)
208210

209211
if (api_configuration_result) {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const process_response = async (params: {
6262
args: ApplyResponseCommandArgs | undefined
6363
response: string
6464
response_items: ResponseItem[]
65-
context: vscode.ExtensionContext
65+
extension_context: vscode.ExtensionContext
6666
panel_provider: PanelProvider
6767
workspace_provider: WorkspaceProvider
6868
}): Promise<PreviewData | null> => {
@@ -100,7 +100,7 @@ export const process_response = async (params: {
100100
}
101101
})
102102
update_undo_button_state({
103-
context: params.context,
103+
extension_context: params.extension_context,
104104
panel_provider: params.panel_provider,
105105
states: augmented_states,
106106
applied_content: params.response,
@@ -415,7 +415,7 @@ export const process_response = async (params: {
415415
set_new_paths_in_original_states(all_original_states)
416416
await apply_file_relocations(all_original_states)
417417
update_undo_button_state({
418-
context: params.context,
418+
extension_context: params.extension_context,
419419
panel_provider: params.panel_provider,
420420
states: all_original_states,
421421
applied_content: params.response,
@@ -557,12 +557,12 @@ export const process_response = async (params: {
557557
const markdown_response_for_active_editor = `\`\`\`\n// ${file_path_for_block}\n${params.response}\n\`\`\``
558558

559559
const model_providers_manager = new ModelProvidersManager(
560-
params.context
560+
params.extension_context
561561
)
562562
const api_configuration_result = await get_intelligent_update_config(
563563
model_providers_manager,
564564
false,
565-
params.context
565+
params.extension_context
566566
)
567567

568568
if (!api_configuration_result) {
@@ -581,14 +581,14 @@ export const process_response = async (params: {
581581
api_key: model_provider.api_key,
582582
api_configuration: intelligent_update_api_configuration,
583583
chat_response: markdown_response_for_active_editor,
584-
context: params.context,
584+
extension_context: params.extension_context,
585585
is_single_root_folder_workspace,
586586
panel_provider: params.panel_provider
587587
})
588588

589589
if (intelligent_update_states) {
590590
update_undo_button_state({
591-
context: params.context,
591+
extension_context: params.extension_context,
592592
panel_provider: params.panel_provider,
593593
states: intelligent_update_states,
594594
applied_content: markdown_response_for_active_editor,
@@ -729,7 +729,7 @@ export const process_response = async (params: {
729729

730730
if (operation_success && final_original_states) {
731731
update_undo_button_state({
732-
context: params.context,
732+
extension_context: params.extension_context,
733733
panel_provider: params.panel_provider,
734734
states: final_original_states,
735735
applied_content: params.response,
@@ -742,7 +742,7 @@ export const process_response = async (params: {
742742
}
743743
} else {
744744
update_undo_button_state({
745-
context: params.context,
745+
extension_context: params.extension_context,
746746
panel_provider: params.panel_provider,
747747
states: null
748748
})

‎apps/editor/src/commands/apply-response-command/utils/preview-handler.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const preview_handler = async (params: {
1414
original_states: OriginalFileState[]
1515
chat_response: string
1616
panel_provider: PanelProvider
17-
context: vscode.ExtensionContext
17+
extension_context: vscode.ExtensionContext
1818
original_editor_state?: {
1919
file_path: string
2020
position: { line: number; character: number }
@@ -35,7 +35,7 @@ export const preview_handler = async (params: {
3535
panel_provider: params.panel_provider,
3636
raw_instructions: params.raw_instructions,
3737
chat_response: params.chat_response,
38-
context: params.context,
38+
extension_context: params.extension_context,
3939
created_at: params.created_at,
4040
url: params.url,
4141
recent_api_configuration: params.recent_api_configuration
@@ -82,7 +82,7 @@ export const preview_handler = async (params: {
8282
original_states: params.original_states
8383
})
8484
update_undo_button_state({
85-
context: params.context,
85+
extension_context: params.extension_context,
8686
panel_provider: params.panel_provider,
8787
states: null
8888
})
@@ -137,7 +137,7 @@ export const preview_handler = async (params: {
137137

138138
for (const [workspace_root, files] of files_by_workspace.entries()) {
139139
PromptsForCommitMessagesUtils.add({
140-
context: params.context,
140+
extension_context: params.extension_context,
141141
workspace_root,
142142
prompt: params.raw_instructions,
143143
files
@@ -146,7 +146,7 @@ export const preview_handler = async (params: {
146146
}
147147

148148
update_undo_button_state({
149-
context: params.context,
149+
extension_context: params.extension_context,
150150
panel_provider: params.panel_provider,
151151
states: accepted_states,
152152
applied_content: params.chat_response,
@@ -187,7 +187,7 @@ export const preview_handler = async (params: {
187187
return true
188188
} else {
189189
update_undo_button_state({
190-
context: params.context,
190+
extension_context: params.extension_context,
191191
panel_provider: params.panel_provider,
192192
states: null
193193
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const preview = async (params: {
2828
panel_provider: PanelProvider
2929
raw_instructions?: string
3030
chat_response: string
31-
context: vscode.ExtensionContext
31+
extension_context: vscode.ExtensionContext
3232
created_at?: number
3333
url?: string
3434
recent_api_configuration?: RecentApiConfiguration

‎apps/editor/src/commands/apply-response-command/utils/state-manager.ts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { OriginalFileState } from '../types/original-file-state'
88
import { PanelProvider } from '@/views/panel/backend/panel-provider'
99

1010
export const update_undo_button_state = (params: {
11-
context: vscode.ExtensionContext
11+
extension_context: vscode.ExtensionContext
1212
panel_provider: PanelProvider
1313
states: OriginalFileState[] | null
1414
applied_content?: string | null
@@ -18,26 +18,29 @@ export const update_undo_button_state = (params: {
1818
} | null
1919
}) => {
2020
if (params.states && params.states.length > 0) {
21-
params.context.workspaceState.update(
21+
params.extension_context.workspaceState.update(
2222
LAST_APPLIED_CHANGES_STATE_KEY,
2323
params.states
2424
)
25-
params.context.workspaceState.update(
25+
params.extension_context.workspaceState.update(
2626
LAST_APPLIED_CLIPBOARD_CONTENT_STATE_KEY,
2727
params.applied_content
2828
)
29-
params.context.workspaceState.update(
29+
params.extension_context.workspaceState.update(
3030
LAST_APPLIED_CHANGES_EDITOR_STATE_STATE_KEY,
3131
params.original_editor_state
3232
)
3333
params.panel_provider.set_undo_button_state(true)
3434
} else {
35-
params.context.workspaceState.update(LAST_APPLIED_CHANGES_STATE_KEY, null)
36-
params.context.workspaceState.update(
35+
params.extension_context.workspaceState.update(
36+
LAST_APPLIED_CHANGES_STATE_KEY,
37+
null
38+
)
39+
params.extension_context.workspaceState.update(
3740
LAST_APPLIED_CLIPBOARD_CONTENT_STATE_KEY,
3841
null
3942
)
40-
params.context.workspaceState.update(
43+
params.extension_context.workspaceState.update(
4144
LAST_APPLIED_CHANGES_EDITOR_STATE_STATE_KEY,
4245
null
4346
)

‎apps/editor/src/commands/code-at-cursor-command/code-at-cursor-commands.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import { perform_code_at_cursor } from './utils/perform-code-at-cursor'
55
export const code_at_cursor_commands = (params: {
66
file_tree_provider: any
77
open_editors_provider: any
8-
context: vscode.ExtensionContext
8+
extension_context: vscode.ExtensionContext
99
panel_provider: PanelProvider
1010
}) => {
1111
return [
1212
vscode.commands.registerCommand('codeWebChat.codeAtCursor', async () =>
1313
perform_code_at_cursor({
1414
file_tree_provider: params.file_tree_provider,
1515
open_editors_provider: params.open_editors_provider,
16-
context: params.context,
16+
extension_context: params.extension_context,
1717
with_completion_instructions: false,
1818
show_quick_pick: false
1919
})
@@ -24,7 +24,7 @@ export const code_at_cursor_commands = (params: {
2424
perform_code_at_cursor({
2525
file_tree_provider: params.file_tree_provider,
2626
open_editors_provider: params.open_editors_provider,
27-
context: params.context,
27+
extension_context: params.extension_context,
2828
with_completion_instructions: true,
2929
show_quick_pick: false
3030
})
@@ -33,7 +33,7 @@ export const code_at_cursor_commands = (params: {
3333
perform_code_at_cursor({
3434
file_tree_provider: params.file_tree_provider,
3535
open_editors_provider: params.open_editors_provider,
36-
context: params.context,
36+
extension_context: params.extension_context,
3737
with_completion_instructions: false,
3838
show_quick_pick: true,
3939
panel_provider: params.panel_provider
@@ -45,7 +45,7 @@ export const code_at_cursor_commands = (params: {
4545
perform_code_at_cursor({
4646
file_tree_provider: params.file_tree_provider,
4747
open_editors_provider: params.open_editors_provider,
48-
context: params.context,
48+
extension_context: params.extension_context,
4949
with_completion_instructions: true,
5050
show_quick_pick: true,
5151
panel_provider: params.panel_provider

‎apps/editor/src/commands/code-at-cursor-command/utils/get-code-at-cursor-config.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
export const get_code_at_cursor_api_configuration = async (params: {
1818
model_providers_manager: ModelProvidersManager
1919
show_quick_pick?: boolean
20-
context: vscode.ExtensionContext
20+
extension_context: vscode.ExtensionContext
2121
api_configuration_id?: string
2222
panel_provider?: PanelProvider
2323
}): Promise<{ model_provider: any; api_configuration: any } | undefined> => {
@@ -45,9 +45,10 @@ export const get_code_at_cursor_api_configuration = async (params: {
4545
if (default_api_configuration) {
4646
selected_api_configuration = default_api_configuration
4747
} else {
48-
const last_selected_id = params.context.workspaceState.get<string>(
49-
LAST_USED_CODE_AT_CURSOR_CONFIG_ID_STATE_KEY
50-
)
48+
const last_selected_id =
49+
params.extension_context.workspaceState.get<string>(
50+
LAST_USED_CODE_AT_CURSOR_CONFIG_ID_STATE_KEY
51+
)
5152
if (last_selected_id) {
5253
selected_api_configuration =
5354
code_at_cursor_api_configurations.find(
@@ -64,9 +65,10 @@ export const get_code_at_cursor_api_configuration = async (params: {
6465
}
6566

6667
if (!selected_api_configuration || params.show_quick_pick) {
67-
const last_selected_id = params.context.workspaceState.get<string>(
68-
LAST_USED_CODE_AT_CURSOR_CONFIG_ID_STATE_KEY
69-
)
68+
const last_selected_id =
69+
params.extension_context.workspaceState.get<string>(
70+
LAST_USED_CODE_AT_CURSOR_CONFIG_ID_STATE_KEY
71+
)
7072

7173
const result = await show_configuration_quick_pick({
7274
items: code_at_cursor_api_configurations,
@@ -81,7 +83,7 @@ export const get_code_at_cursor_api_configuration = async (params: {
8183

8284
const { item: api_configuration, id } = result
8385

84-
params.context.workspaceState.update(
86+
params.extension_context.workspaceState.update(
8587
LAST_USED_CODE_AT_CURSOR_CONFIG_ID_STATE_KEY,
8688
id
8789
)

0 commit comments

Comments
 (0)