Refactor config handlers to ensure prompt field regains focus after quick pick dismissal

Author: robertpiosik

apps/editor/src/views/panel/backend/message-handlers/handle-code-completion.ts

@@ -31,8 +31,8 @@ const get_code_completion_config = async (
   api_providers_manager: ModelProvidersManager,
   show_quick_pick: boolean = false,
   context: vscode.ExtensionContext,
-  config_id?: string,
-  panel_provider?: PanelProvider
+  panel_provider: PanelProvider,
+  config_id?: string
 ): Promise<{ provider: any; config: any } | undefined> => {
   const code_completions_configs =
     await api_providers_manager.get_code_completions_tool_configs()
@@ -234,6 +234,9 @@ const get_code_completion_config = async (
 
         quick_pick.onDidHide(() => {
           quick_pick.dispose()
+          if (panel_provider) {
+            panel_provider.send_message({ command: 'FOCUS_PROMPT_FIELD' })
+          }
           resolve(undefined)
         })
 
@@ -276,16 +279,14 @@ export const handle_code_completion = async (
     api_providers_manager,
     message.use_quick_pick,
     panel_provider.context,
-    message.config_id,
-    panel_provider
+    panel_provider,
+    message.config_id
   )
 
   if (!config_result) {
     return
   }
 
-  panel_provider.send_message({ command: 'FOCUS_PROMPT_FIELD' })
-
   const { provider, config: code_completions_config } = config_result
 
   if (!code_completions_config.provider_name) {

apps/editor/src/views/panel/backend/message-handlers/handle-edit-context.ts

@@ -38,13 +38,20 @@ import {
   EDIT_FORMAT_INSTRUCTIONS_DIFF
 } from '@/constants/edit-format-instructions'
 
-const get_edit_context_config = async (
-  api_providers_manager: ModelProvidersManager,
-  show_quick_pick: boolean = false,
-  context: vscode.ExtensionContext,
-  panel_provider: PanelProvider,
+const get_edit_context_config = async (params: {
+  api_providers_manager: ModelProvidersManager
+  show_quick_pick?: boolean
+  context: vscode.ExtensionContext
+  panel_provider: PanelProvider
   config_id?: string
-): Promise<{ provider: Provider; config: ToolConfig } | undefined> => {
+}): Promise<{ provider: Provider; config: ToolConfig } | undefined> => {
+  const {
+    api_providers_manager,
+    show_quick_pick,
+    context,
+    panel_provider,
+    config_id
+  } = params
   const edit_context_configs =
     await api_providers_manager.get_edit_context_tool_configs()
 
@@ -245,6 +252,9 @@ const get_edit_context_config = async (
 
         quick_pick.onDidHide(() => {
           quick_pick.dispose()
+          if (panel_provider) {
+            panel_provider.send_message({ command: 'FOCUS_PROMPT_FIELD' })
+          }
           if (!accepted) {
             resolve(undefined)
           }
@@ -370,22 +380,18 @@ export const handle_edit_context = async (
 
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    const config_result = await get_edit_context_config(
+    const config_result = await get_edit_context_config({
       api_providers_manager,
-      should_show_quick_pick,
-      panel_provider.context,
+      show_quick_pick: should_show_quick_pick,
+      context: panel_provider.context,
       panel_provider,
-      current_config_id
-    )
+      config_id: current_config_id
+    })
 
     if (!config_result) {
       return
     }
 
-    if (!message.config_id) {
-      panel_provider.send_message({ command: 'FOCUS_PROMPT_FIELD' })
-    }
-
     const { provider, config: edit_context_config } = config_result
 
     let endpoint_url = ''

apps/editor/src/views/panel/backend/message-handlers/handle-send-to-browser.ts

@@ -517,6 +517,7 @@ async function show_preset_quick_pick(params: {
     quick_pick.onDidHide(() => {
       disposables.forEach((d) => d.dispose())
       quick_pick.dispose()
+      panel_provider.send_message({ command: 'FOCUS_PROMPT_FIELD' })
       do_resolve(null)
     })