Skip to content

Commit 7d9d9ad

Browse files
committed
Fix show settings hunging up issue
1 parent e2a1835 commit 7d9d9ad

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ 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
56
import com.alibaba.fastjson.JSONObject
67
import com.intellij.openapi.actionSystem.*
78
import com.intellij.openapi.application.ApplicationManager
@@ -14,8 +15,8 @@ class ShowSettingDialogRequestHandler(metadata: JSONObject?, payload: JSONObject
1415
val project = handler?.project
1516
val dataContext = DataContext { dataId -> project.takeIf { CommonDataKeys.PROJECT.name == dataId }}
1617
val settingsAction = ActionManager.getInstance().getAction("ShowSettings")
17-
val event = AnActionEvent.createFromDataContext(ActionPlaces.UNKNOWN, null, dataContext)
18+
val event = AnActionEvent.createFromDataContext(ActionPlaces.POPUP, null, dataContext)
1819
ApplicationManager.getApplication().invokeLater { settingsAction.actionPerformed(event) }
19-
ShowSettingsUtil.getInstance().showSettingsDialog(project, "DevChat")
20+
ShowSettingsUtil.getInstance().editConfigurable(project, DevChatSettingsConfigurable.get())
2021
}
2122
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,10 @@ class DevChatSettingsConfigurable : Configurable {
5555
override fun disposeUIResources() {
5656
devChatSettingsComponent = null
5757
}
58+
59+
companion object {
60+
fun get(): DevChatSettingsConfigurable {
61+
return DevChatSettingsConfigurable()
62+
}
63+
}
5864
}

0 commit comments

Comments
 (0)