Skip to content

Commit 216e7d0

Browse files
committed
Remove duplicate recent presets tracking and consolidate state updates in update_last_used_preset_or_group
1 parent d973d2a commit 216e7d0

3 files changed

Lines changed: 9 additions & 48 deletions

File tree

‎packages/vscode/src/views/panel/backend/message-handlers/handle-send-prompt.ts‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -91,26 +91,6 @@ export const handle_send_prompt = async (params: {
9191
preset_name: params.preset_name,
9292
group_name: params.group_name
9393
})
94-
95-
const name_to_save = params.preset_name || params.group_name
96-
if (name_to_save) {
97-
const mode = params.panel_provider.web_prompt_type
98-
const recents_key = get_recently_used_presets_or_groups_key(mode)
99-
const context = params.panel_provider.context
100-
101-
const recents =
102-
context.workspaceState.get<string[]>(recents_key) ??
103-
context.globalState.get<string[]>(recents_key) ??
104-
[]
105-
106-
const new_recents = [
107-
name_to_save,
108-
...recents.filter((r) => r != name_to_save)
109-
].slice(0, 10)
110-
111-
context.workspaceState.update(recents_key, new_recents)
112-
context.globalState.update(recents_key, new_recents)
113-
}
11494
}
11595

11696
await vscode.workspace.saveAll()
@@ -468,18 +448,6 @@ async function show_preset_quick_pick(params: {
468448
preset_name: selected.preset_name,
469449
group_name: group_name
470450
})
471-
const name_to_save = selected.preset_name
472-
const recents_key = get_recently_used_presets_or_groups_key(mode)
473-
const recents =
474-
context.workspaceState.get<string[]>(recents_key) ??
475-
context.globalState.get<string[]>(recents_key) ??
476-
[]
477-
const newRecents = [
478-
name_to_save,
479-
...recents.filter((r) => r != name_to_save)
480-
].slice(0, 10)
481-
context.workspaceState.update(recents_key, newRecents)
482-
context.globalState.update(recents_key, newRecents)
483451
do_resolve({ preset_names: [selected.preset_name] })
484452
}
485453
} else if (selected.group_name) {
@@ -505,17 +473,6 @@ async function show_preset_quick_pick(params: {
505473

506474
if (preset_names.length > 0) {
507475
update_last_used_preset_or_group({ panel_provider, group_name })
508-
const recents_key = get_recently_used_presets_or_groups_key(mode)
509-
const recents =
510-
context.workspaceState.get<string[]>(recents_key) ??
511-
context.globalState.get<string[]>(recents_key) ??
512-
[]
513-
const newRecents = [
514-
group_name,
515-
...recents.filter((r) => r !== group_name)
516-
].slice(0, 10)
517-
context.workspaceState.update(recents_key, newRecents)
518-
context.globalState.update(recents_key, newRecents)
519476
do_resolve({ preset_names })
520477
}
521478
} else {

‎packages/vscode/src/views/panel/backend/message-handlers/update-last-used-preset-or-group.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@ export const update_last_used_preset_or_group = (params: {
1313
params.panel_provider.web_prompt_type
1414
)
1515
const recents =
16-
params.panel_provider.context.globalState.get<string[]>(
17-
recents_key,
18-
[]
19-
) ?? []
16+
params.panel_provider.context.workspaceState.get<string[]>(recents_key) ??
17+
params.panel_provider.context.globalState.get<string[]>(recents_key, [])
2018

2119
const new_recents = [
2220
name_to_save,
2321
...recents.filter((r) => r != name_to_save)
2422
].slice(0, 10)
2523

24+
params.panel_provider.context.workspaceState.update(
25+
recents_key,
26+
new_recents
27+
)
2628
params.panel_provider.context.globalState.update(recents_key, new_recents)
2729

2830
params.panel_provider.send_message({

‎packages/vscode/src/views/panel/backend/panel-provider.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,9 @@ export class PanelProvider implements vscode.WebviewViewProvider {
789789
const presets_for_mode = all_presets[prompt_type]
790790
let selected_name: string | undefined = undefined
791791
const key = get_recently_used_presets_or_groups_key(prompt_type)
792-
const recents = this.context.globalState.get<string[]>(key, [])
792+
const recents =
793+
this.context.workspaceState.get<string[]>(key) ??
794+
this.context.globalState.get<string[]>(key, [])
793795
const last_selected = recents[0]
794796
if (last_selected) {
795797
if (last_selected == 'Ungrouped') {

0 commit comments

Comments
 (0)