Skip to content

Commit 09ccacf

Browse files
committed
Tidy
1 parent e1ca696 commit 09ccacf

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/core/config/importExport.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import * as vscode from "vscode"
66
import { z } from "zod"
77

88
import { globalSettingsSchema } from "../../schemas"
9+
910
import { ProviderSettingsManager, providerProfilesSchema } from "./ProviderSettingsManager"
1011
import { ContextProxy } from "./ContextProxy"
1112
import { CustomModesManager } from "./CustomModesManager"
12-
import { ProviderSettings } from "../../exports/types"
1313

1414
type ImportOptions = {
1515
providerSettingsManager: ProviderSettingsManager
@@ -63,15 +63,18 @@ export const importSettings = async ({ providerSettingsManager, contextProxy, cu
6363
await providerSettingsManager.import(newProviderProfiles)
6464
await contextProxy.setValues(globalSettings)
6565

66-
// For the future we should remove the provider from the proxy and keep
67-
// providerSettingsManager as source of truth for apiConfig.
68-
const providerSettings: ProviderSettings = Object.values(providerProfiles.apiConfigs)[0]
66+
// Set the current provider.
67+
const currentProviderName = providerProfiles.currentApiConfigName
68+
const currentProvider = providerProfiles.apiConfigs[currentProviderName]
69+
contextProxy.setValue("currentApiConfigName", currentProviderName)
6970

70-
if (providerSettings) {
71-
contextProxy.setProviderSettings(providerSettings)
71+
// TODO: It seems like we don't need to have the provider settings in
72+
// the proxy; we can just use providerSettingsManager as the source of
73+
// truth.
74+
if (currentProvider) {
75+
contextProxy.setProviderSettings(currentProvider)
7276
}
7377

74-
contextProxy.setValue("currentApiConfigName", providerProfiles.currentApiConfigName)
7578
contextProxy.setValue("listApiConfigMeta", await providerSettingsManager.listConfig())
7679

7780
return { providerProfiles, globalSettings, success: true }

0 commit comments

Comments
 (0)