Merge pull request #130 from fioan89/fix-context-menu-on-2023.1.1

Fix context menu on 2023.1.1

Author: fioan89

CHANGELOG.md

@@ -4,12 +4,18 @@
 
 ## Unreleased
 
-## Changed
+### Fixed
+
+- context menu takes a long time to open when using the New UI
+
+### Changed
+
 - removed deprecated API usages
 
 ## 2.0.3 - 2023-03-01
 
 ### Added
+
 - support for experimental new UI
 
 ### Changed

gradle.properties

@@ -1,14 +1,14 @@
 pluginGroup=org.wavescale.sourcesync
 pluginName=sourcesync
 # SemVer format -> https://semver.org
-pluginVersion=2.0.3
+pluginVersion=2.0.4
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild=223
+pluginSinceBuild=231
 pluginUntilBuild=
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType=IC
-platformVersion=2023.1
+platformVersion=2023.1.1
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins=
@@ -20,3 +20,4 @@ gradleVersion=7.4
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
 # suppress inspection "UnusedProperty"
 kotlin.stdlib.default.dependency=false
+org.gradle.jvmargs=-Xmx2048m

src/main/kotlin/org/wavescale/sourcesync/action/NewUIConnectionConfigurationSelector.kt

@@ -1,61 +1,46 @@
 package org.wavescale.sourcesync.action
 
-import com.intellij.openapi.actionSystem.ActionGroup
-import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.actionSystem.DefaultActionGroup
-import com.intellij.openapi.actionSystem.PlatformDataKeys
-import com.intellij.openapi.actionSystem.Presentation
-import com.intellij.openapi.actionSystem.Separator
-import com.intellij.openapi.actionSystem.ToggleAction
-import com.intellij.openapi.actionSystem.Toggleable
-import com.intellij.openapi.actionSystem.ex.CustomComponentAction
-import com.intellij.openapi.actionSystem.impl.ActionButtonWithText
+import com.intellij.ide.ui.laf.darcula.ui.ToolbarComboWidgetUI
+import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.components.service
-import com.intellij.openapi.project.DumbAware
-import com.intellij.openapi.ui.popup.ListPopup
-import com.intellij.openapi.ui.popup.PopupStep
+import com.intellij.openapi.ui.popup.JBPopup
+import com.intellij.openapi.wm.impl.ExpandableComboAction
+import com.intellij.openapi.wm.impl.ToolbarComboWidget
 import com.intellij.ui.components.JBList
 import com.intellij.ui.popup.PopupFactoryImpl
-import com.intellij.ui.popup.WizardPopup
-import com.intellij.ui.popup.util.PopupImplUtil
-import com.intellij.util.ui.JBDimension
-import com.intellij.util.ui.JBInsets
-import com.intellij.util.ui.JBUI
 import org.wavescale.sourcesync.SourceSyncIcons
 import org.wavescale.sourcesync.SourcesyncBundle
 import org.wavescale.sourcesync.factory.ConfigConnectionFactory
 import org.wavescale.sourcesync.factory.ConnectionConfig
 import org.wavescale.sourcesync.services.SyncStatusService
-import java.awt.Graphics
-import java.awt.Insets
 import javax.swing.JComponent
-import javax.swing.SwingConstants
 
-internal const val MINIMAL_POPUP_WIDTH = 270
-
-class NewUIConnectionConfigurationSelector : ConnectionTogglePopupAction(), CustomComponentAction, DumbAware {
+class NewUIConnectionConfigurationSelector : ExpandableComboAction() {
     private val syncStatusService = service<SyncStatusService>()
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
     override fun displayTextInToolbar() = true
+
+    override fun createPopup(event: AnActionEvent): JBPopup {
+        return SourceSyncConfigurationActionGroupPopup(createActionGroup(), event.dataContext) { Toggleable.setSelected(event.presentation, false) }
+    }
+
     override fun createCustomComponent(presentation: Presentation, place: String): JComponent {
-        return object : ActionButtonWithText(this, presentation, place, JBUI.size(90, 30)) {
-            override fun getMargins(): Insets = JBInsets.create(0, 10)
-            override fun iconTextSpace(): Int = JBUI.scale(10)
-            override fun shallPaintDownArrow() = true
-
-            override fun paint(g: Graphics) {
-                super.paint(g)
-                presentation.icon = if (syncStatusService.isAnySyncJobRunning()) {
-                    SourceSyncIcons.ExpUI.SOURCESYNC_RUNNING
-                } else {
-                    SourceSyncIcons.ExpUI.SOURCESYNC
-                }
-            }
-        }.also {
-            it.setHorizontalTextAlignment(SwingConstants.LEFT)
+        val comp = super.createCustomComponent(presentation, place)
+        (comp.ui as? ToolbarComboWidgetUI)?.setMaxWidth(Int.MAX_VALUE)
+        return comp
+    }
+
+    override fun updateCustomComponent(component: JComponent, presentation: Presentation) {
+        val widget = component as? ToolbarComboWidget ?: return
+        (widget.ui as? ToolbarComboWidgetUI)?.setMaxWidth(500)
+        if (syncStatusService.isAnySyncJobRunning()) {
+            widget.leftIcons = listOfNotNull(SourceSyncIcons.ExpUI.SOURCESYNC_RUNNING)
+        } else {
+            widget.leftIcons = listOfNotNull(SourceSyncIcons.ExpUI.SOURCESYNC)
         }
+
+        widget.text = presentation.text
+        widget.toolTipText = presentation.description
     }
 
     override fun update(e: AnActionEvent) {
@@ -90,47 +75,22 @@ class NewUIConnectionConfigurationSelector : ConnectionTogglePopupAction(), Cust
     }
 }
 
-abstract class ConnectionTogglePopupAction : ToggleAction {
-    constructor()
 
-    override fun isSelected(e: AnActionEvent): Boolean {
-        return Toggleable.isSelected(e.presentation)
-    }
-
-    override fun setSelected(e: AnActionEvent, state: Boolean) {
-        if (!state) return
-        val presentation = e.presentation
-        val component = e.inputEvent?.component as? JComponent ?: return
-        val actionGroup = getActionGroup(e)
-        val disposeCallback = { Toggleable.setSelected(presentation, false) }
-        val popup = createPopup(actionGroup, e, disposeCallback)
-        PopupImplUtil.setPopupToggleButton(popup, e.inputEvent.component)
-        popup.setMinimumSize(JBDimension(MINIMAL_POPUP_WIDTH, 0))
-        popup.showUnderneathOf(component)
-    }
-
-    private fun createPopup(
-        actionGroup: ActionGroup,
-        e: AnActionEvent,
-        disposeCallback: () -> Unit
-    ): ListPopup = SourceSyncConfigurationActionGroupPopup(actionGroup, e.dataContext, disposeCallback)
-
-    private fun getActionGroup(e: AnActionEvent): ActionGroup {
-        val allActionsGroup = DefaultActionGroup()
-        allActionsGroup.add(Separator.create(SourcesyncBundle.message("sourcesyncConfigurations")))
-        ConfigConnectionFactory.getInstance().connectionNames.forEach {
-            allActionsGroup.add(
-                SourceSyncConfigAction(
-                    it
-                )
+private fun createActionGroup(): ActionGroup {
+    val allActionsGroup = DefaultActionGroup()
+    allActionsGroup.add(Separator.create(SourcesyncBundle.message("sourcesyncConfigurations")))
+    ConfigConnectionFactory.getInstance().connectionNames.forEach {
+        allActionsGroup.add(
+            SourceSyncConfigAction(
+                it
             )
-        }
+        )
+    }
 
-        allActionsGroup.add(Separator.create())
-        allActionsGroup.add(ActionManager.getInstance().getAction("actionSourceSyncMenu"))
+    allActionsGroup.add(Separator.create())
+    allActionsGroup.add(ActionManager.getInstance().getAction("actionSourceSyncMenu"))
 
-        return allActionsGroup
-    }
+    return allActionsGroup
 }
 
 class SourceSyncConfigurationActionGroupPopup(
@@ -155,12 +115,6 @@ class SourceSyncConfigurationActionGroupPopup(
         (list as? JBList<*>)?.setExpandableItemsEnabled(false)
     }
 
-    override fun createPopup(parent: WizardPopup?, step: PopupStep<*>?, parentValue: Any?): WizardPopup {
-        val popup = super.createPopup(parent, step, parentValue)
-        popup.setMinimumSize(JBDimension(MINIMAL_POPUP_WIDTH, 0))
-        return popup
-    }
-
     override fun shouldBeShowing(value: Any?) = true
 }
 
@@ -171,6 +125,8 @@ class SourceSyncConfigAction(private val configuration: String) : AnAction() {
         presentation.icon = SourceSyncIcons.ExpUI.SOURCESYNC
     }
 
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+
     override fun actionPerformed(e: AnActionEvent) {
         val projectName = PlatformDataKeys.PROJECT.getData(e.dataContext)!!.name
         associateProjectWithConnection(projectName)

src/main/resources/META-INF/plugin.xml

@@ -21,24 +21,28 @@
         <!-- Add your action here -->
         <action id="actionSourceSyncMenu" class="org.wavescale.sourcesync.action.ActionSourceSyncMenu"
                 text="Edit Sourcesync Configurations">
-            <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift D"/>
+            <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift D" />
         </action>
 
         <action id="OldUIConnectionConfigurationSelector"
                 class="org.wavescale.sourcesync.action.OldUIConnectionConfigurationSelector"
                 text="Sourcesync Configurations"
                 description="Sourcesync Configurations"
                 icon="/sourcesync.svg">
-            <add-to-group group-id="NavBarToolBar"/>
+            <add-to-group group-id="NavBarToolBar" />
         </action>
 
-        <action id="NewUIConnectionConfigurationSelector"
+        <group id="SourcesyncShowPopupActionGroup" />
+        <group id="SourcesyncToolbarGroupNewUI">
+            <reference ref="SourcesyncShowPopupActionGroup" />
+            <add-to-group group-id="MainToolbarRight" anchor="before" relative-to-action="SearchEverywhere" />
+        </group>
+        <action id="SourcesyncConnectionConfigurationSelectorNewUI"
                 class="org.wavescale.sourcesync.action.NewUIConnectionConfigurationSelector"
                 text="Sourcesync Configurations"
                 description="Sourcesync Configurations"
                 icon="/expui/sourcesync.svg">
-            <add-to-group group-id="MainToolbarRight" anchor="after"
-                          relative-to-action="RunToolbarWidgetCustomizableActionGroup"/>
+            <add-to-group group-id="SourcesyncShowPopupActionGroup" />
         </action>
 
         <action id="actionLocalFileToRemote" class="org.wavescale.sourcesync.action.ActionLocalFileToRemote"