Skip to content

Commit 6f64442

Browse files
authored
Merge pull request #25 from devchat-ai/fix-settings-opening
Fix settings opening
2 parents 4adac3e + 2b72664 commit 6f64442

3 files changed

Lines changed: 7 additions & 15 deletions

File tree

src/main/kotlin/ai/devchat/devchat/handler/ShowSettingDialogRequestHandler.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,13 @@ package ai.devchat.devchat.handler
22

33
import ai.devchat.devchat.BaseActionHandler
44
import ai.devchat.devchat.DevChatActions
5-
import ai.devchat.idea.settings.DevChatSettingsConfigurable
65
import com.alibaba.fastjson.JSONObject
7-
import com.intellij.openapi.actionSystem.*
8-
import com.intellij.openapi.application.ApplicationManager
96
import com.intellij.openapi.options.ShowSettingsUtil
107

118

129
class ShowSettingDialogRequestHandler(metadata: JSONObject?, payload: JSONObject?) : BaseActionHandler(metadata, payload) {
1310
override val actionName: String = DevChatActions.SHOW_SETTING_DIALOG_REQUEST
1411
override fun action() {
15-
val project = handler?.project
16-
val dataContext = DataContext { dataId -> project.takeIf { CommonDataKeys.PROJECT.name == dataId }}
17-
val settingsAction = ActionManager.getInstance().getAction("ShowSettings")
18-
val event = AnActionEvent.createFromDataContext(ActionPlaces.POPUP, null, dataContext)
19-
ApplicationManager.getApplication().invokeLater { settingsAction.actionPerformed(event) }
20-
ShowSettingsUtil.getInstance().editConfigurable(project, DevChatSettingsConfigurable.get())
12+
ShowSettingsUtil.getInstance().showSettingsDialog(handler?.project, "DevChat")
2113
}
2214
}

src/main/kotlin/ai/devchat/idea/settings/DevChatSettingsComponent.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ class DevChatSettingsComponent {
1919

2020
init {
2121
panel = FormBuilder.createFormBuilder()
22-
.addLabeledComponent(JBLabel("api_base"), apiBaseText, 1, false)
23-
.addLabeledComponent(JBLabel("api_key"), apiKeyText, 2, false)
24-
.addLabeledComponent(JBLabel("max_log_count"), maxLogCountText, 3, false)
25-
.addLabeledComponent(JBLabel("default_model"), defaultModelText, 4, false)
22+
.addLabeledComponent(JBLabel("API base"), apiBaseText, 1, false)
23+
.addLabeledComponent(JBLabel("API key"), apiKeyText, 2, false)
24+
.addLabeledComponent(JBLabel("Max log count"), maxLogCountText, 3, false)
25+
.addLabeledComponent(JBLabel("Default model"), defaultModelText, 4, false)
2626
.addComponentFillVertically(JPanel(), 0)
2727
.panel
2828
defaultModelText.selectedItem = "gpt-3.5-turbo"

src/main/kotlin/ai/devchat/idea/settings/SupportedModels.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package ai.devchat.idea.settings
22

33
val supportedModels = setOf(
4-
"gpt-3.5",
4+
"gpt-3.5-turbo",
55
// "gpt-3.5-turbo-1106",
6-
"gpt-3.5-16k",
6+
"gpt-3.5-turbo-16k",
77
"gpt-4",
88
// "gpt-4-1106-preview",
99
"claude-2",

0 commit comments

Comments
 (0)