Merge pull request #22 from devchat-ai/fix-show-settings

Fix show settings

Author: pplam

.idea/misc.xml

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "ai.devchat"
-version = "0.0.4"
+version = "0.0.1"
 
 repositories {
     mavenCentral()
@@ -49,7 +49,8 @@ tasks {
     }
 
     publishPlugin {
-        token.set(System.getenv("PUBLISH_TOKEN"))
+        token.set(System.getenv("INTELLIJ_PUBLISH_TOKEN"))
+        channels.set(listOf("eap"))
     }
 }
 kotlin {

build.gradle.kts

@@ -2,6 +2,7 @@ package ai.devchat.devchat.handler
 
 import ai.devchat.devchat.BaseActionHandler
 import ai.devchat.devchat.DevChatActions
+import ai.devchat.idea.settings.DevChatSettingsConfigurable
 import com.alibaba.fastjson.JSONObject
 import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.application.ApplicationManager
@@ -14,8 +15,8 @@ class ShowSettingDialogRequestHandler(metadata: JSONObject?, payload: JSONObject
         val project = handler?.project
         val dataContext = DataContext { dataId -> project.takeIf { CommonDataKeys.PROJECT.name == dataId }}
         val settingsAction = ActionManager.getInstance().getAction("ShowSettings")
-        val event = AnActionEvent.createFromDataContext(ActionPlaces.UNKNOWN, null, dataContext)
+        val event = AnActionEvent.createFromDataContext(ActionPlaces.POPUP, null, dataContext)
         ApplicationManager.getApplication().invokeLater { settingsAction.actionPerformed(event) }
-        ShowSettingsUtil.getInstance().showSettingsDialog(project, "DevChat")
+        ShowSettingsUtil.getInstance().editConfigurable(project, DevChatSettingsConfigurable.get())
     }
 }

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

@@ -55,4 +55,10 @@ class DevChatSettingsConfigurable : Configurable {
     override fun disposeUIResources() {
         devChatSettingsComponent = null
     }
+
+    companion object {
+        fun get(): DevChatSettingsConfigurable {
+            return DevChatSettingsConfigurable()
+        }
+    }
 }

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

@@ -8,7 +8,7 @@
     <name>DevChat</name>
 
     <!-- A displayed Vendor name or Organization ID displayed on the Plugins Page. -->
-    <vendor email="tao.hu@merico.dev" url="https://www.devchat.ai">DevChat</vendor>
+    <vendor email="shiwen@merico.dev" url="https://www.devchat.ai">DevChat</vendor>
 
     <!-- Description of the plugin displayed on the Plugin Page and IDE Plugin Manager.
          Simple HTML elements (text formatting, paragraphs, and lists) can be added inside of <![CDATA[ ]]> tag.