Ensure getCurrentActiveProject is called on EDT and improve project retrieval logic

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/common/helper/ActiveProjectHelper.kt

@@ -15,6 +15,7 @@
  */
 package org.domaframework.doma.intellij.common.helper
 
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.wm.IdeFocusManager
@@ -27,22 +28,27 @@ object ActiveProjectHelper {
     }
 
     fun getCurrentActiveProject(): Project? {
-        val initProject = activeProject
-        val active = getActiveUIProject()
-        return active ?: initProject
+        // If EDT, get from focus
+        if (ApplicationManager.getApplication().isDispatchThread) {
+            getActiveUIProject()?.let { return it }
+        }
+        // If not EDT, the top of openProjects
+        ProjectManager
+            .getInstance()
+            .openProjects
+            .firstOrNull()
+            ?.let { return it }
+
+        return activeProject
     }
 
     private fun getActiveUIProject(): Project? {
         val openProjects: Array<out Project> = ProjectManager.getInstance().openProjects
-        var active: Project? = null
-
         for (project in openProjects) {
             if (IdeFocusManager.getInstance(project).focusOwner != null) {
-                active = project
-                break
+                return project
             }
         }
-
-        return active
+        return null
     }
 }

src/main/kotlin/org/domaframework/doma/intellij/setting/DomaToolsConfigurable.kt

@@ -17,28 +17,31 @@ package org.domaframework.doma.intellij.setting
 
 import com.intellij.openapi.options.Configurable
 import com.intellij.openapi.options.ConfigurationException
+import com.intellij.util.ui.UIUtil.setEnabledRecursively
 import org.domaframework.doma.intellij.common.helper.ActiveProjectHelper
 import org.domaframework.doma.intellij.setting.state.DomaToolsCustomFunctionSettings
 import org.domaframework.doma.intellij.setting.state.DomaToolsFormatEnableSettings
 import javax.swing.JComponent
 
 class DomaToolsConfigurable : Configurable {
     private var mySettingsComponent: SettingComponent? = SettingComponent()
-    private val project = ActiveProjectHelper.getCurrentActiveProject()
 
     private var formatSettings: DomaToolsFormatEnableSettings? = null
     private var customFunctionsSettings: DomaToolsCustomFunctionSettings? = null
 
-    init {
-        project?.let {
-            customFunctionsSettings = DomaToolsCustomFunctionSettings.getInstance(it)
-            formatSettings = DomaToolsFormatEnableSettings.getInstance(it)
-        }
-    }
-
     override fun getDisplayName(): String = "Doma Tools"
 
-    override fun createComponent(): JComponent? = mySettingsComponent?.panel
+    override fun createComponent(): JComponent? {
+        val project = ActiveProjectHelper.getCurrentActiveProject()
+        val panel = mySettingsComponent?.panel ?: return null
+        if (project == null) {
+            setEnabledRecursively(panel, false)
+            return null
+        }
+        customFunctionsSettings = DomaToolsCustomFunctionSettings.getInstance(project)
+        formatSettings = DomaToolsFormatEnableSettings.getInstance(project)
+        return panel
+    }
 
     override fun isModified(): Boolean {
         val enableFormatModified = formatSettings?.isModified(mySettingsComponent) != false

src/main/kotlin/org/domaframework/doma/intellij/setting/SettingComponent.kt

@@ -20,7 +20,6 @@ import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBList
 import com.intellij.util.ui.FormBuilder
-import com.intellij.util.ui.UIUtil.setEnabledRecursively
 import org.domaframework.doma.intellij.bundle.MessageBundle
 import org.domaframework.doma.intellij.common.helper.ActiveProjectHelper
 import org.domaframework.doma.intellij.common.helper.ExpressionFunctionsHelper
@@ -86,11 +85,6 @@ class SettingComponent {
                 }.disableUpDownActions()
                 .createPanel()
 
-        // Disable customFunctionPanel if no active project is available
-        if (ActiveProjectHelper.getCurrentActiveProject() == null) {
-            setEnabledRecursively(customFunctionPanel, false)
-        }
-
         this.panel =
             FormBuilder
                 .createFormBuilder()