auto-trigger revamp changes [all changes]

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt

@@ -59,5 +59,5 @@ fun Project.buildMetadata() =
     } catch(e: Exception) {
         logger.warn("Could not determine current commit", e)
 
-        "unknownCommit"
+        "beta.20240910"
     }

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.30-SNAPSHOT
+toolkitVersion=99.99.2
 
 # Publish Settings
 publishToken=

plugins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml

@@ -27,6 +27,8 @@
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceInterface="migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator"
                             serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.customization.DefaultCodeWhispererModelConfigurator"/>
+        <applicationService overrides="true" serviceInterface="com.intellij.ide.plugins.PluginManagementPolicy"
+                 serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.plugin.QBetaPluginManagementPolicy"/>
 
         <projectService serviceInterface="software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor"
                         serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptorImpl"
@@ -81,9 +83,32 @@
         </group>
 
         <action class="software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererRecommendationAction"
-                text="Show Code Suggestions">
+                text="Invoke Amazon Q Inline Suggestions">
             <keyboard-shortcut keymap="$default" first-keystroke="alt C"/>
         </action>
+        <action id="codewhisperer.inline.navigate.previous"
+                class="software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererNavigatePrevAction"
+                text="Navigate to Previous Inline Suggestion" description="Navigate to previous inline suggestion">
+            <keyboard-shortcut keymap="$default" first-keystroke="alt OPEN_BRACKET"/>
+        </action>
+        <action id="codewhisperer.inline.navigate.next"
+                class="software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererNavigateNextAction"
+                text="Navigate to Next Inline Suggestion" description="Navigate to next inline suggestion">
+            <keyboard-shortcut keymap="$default" first-keystroke="alt CLOSE_BRACKET"/>
+        </action>
+        <action id="codewhisperer.inline.accept"
+                class="software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererAcceptAction"
+                text="Accept the Current Inline Suggestion" description="Accept the current inline suggestions">
+            <keyboard-shortcut keymap="$default" first-keystroke="TAB"/>
+        </action>
+        <action id="codewhisperer.inline.force.accept"
+                class="software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererForceAcceptAction"
+                text="Force Accept the Current Inline Suggestion" description="Force accept the current inline suggestion">
+            <keyboard-shortcut keymap="$default" first-keystroke="alt TAB"/>
+            <keyboard-shortcut keymap="$default" first-keystroke="alt ENTER"/>
+        </action>
+
+
         <group id="aws.toolkit.codewhisperer.toolbar.security">
             <action
                 id="codewhisperer.toolbar.security.scan"

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererAcceptAction.kt

@@ -0,0 +1,35 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.actions
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.DumbAware
+import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
+import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
+import software.aws.toolkits.resources.message
+
+open class CodeWhispererAcceptAction(title: String = message("codewhisperer.inline.accept")) : AnAction(title), DumbAware {
+    override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.EDT
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabled = e.project != null && e.getData(CommonDataKeys.EDITOR) != null &&
+            CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
+    }
+
+    override fun actionPerformed(e: AnActionEvent) {
+        val sessionContext = e.project?.getUserData(CodeWhispererService.KEY_SESSION_CONTEXT) ?: return
+        if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return
+        ApplicationManager.getApplication().messageBus.syncPublisher(
+            CodeWhispererPopupManager.CODEWHISPERER_USER_ACTION_PERFORMED
+        ).beforeAccept(sessionContext)
+    }
+}
+
+// A same accept action but different key shortcut and different promoter logic
+class CodeWhispererForceAcceptAction(title: String = message("codewhisperer.inline.force.accept")) : CodeWhispererAcceptAction(title)

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererActionPromoter.kt

@@ -3,38 +3,50 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.actions
 
+import com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction
 import com.intellij.openapi.actionSystem.ActionPromoter
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.actionSystem.EditorAction
-import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.CodeWhispererPopupLeftArrowHandler
-import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.CodeWhispererPopupRightArrowHandler
-import software.aws.toolkits.jetbrains.services.codewhisperer.popup.handlers.CodeWhispererPopupTabHandler
+import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
 
 class CodeWhispererActionPromoter : ActionPromoter {
     override fun promote(actions: MutableList<out AnAction>, context: DataContext): MutableList<AnAction> {
         val results = actions.toMutableList()
+        if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return results
+
         results.sortWith { a, b ->
-            if (isCodeWhispererPopupAction(a)) {
+            if (isCodeWhispererForceAction(a)) {
+                return@sortWith -1
+            } else if (isCodeWhispererForceAction(b)) {
+                return@sortWith 1
+            }
+
+            if (a is ChooseItemAction) {
                 return@sortWith -1
-            } else if (isCodeWhispererPopupAction(b)) {
+            } else if (b is ChooseItemAction) {
                 return@sortWith 1
-            } else {
-                0
             }
+
+            if (isCodeWhispererAcceptAction(a)) {
+                return@sortWith -1
+            } else if (isCodeWhispererAcceptAction(b)) {
+                return@sortWith 1
+            }
+
+            0
         }
         return results
     }
 
     private fun isCodeWhispererAcceptAction(action: AnAction): Boolean =
-        action is EditorAction && action.handler is CodeWhispererPopupTabHandler
+        action is CodeWhispererAcceptAction
+
+    private fun isCodeWhispererForceAcceptAction(action: AnAction): Boolean =
+        action is CodeWhispererForceAcceptAction
 
     private fun isCodeWhispererNavigateAction(action: AnAction): Boolean =
-        action is EditorAction && (
-            action.handler is CodeWhispererPopupRightArrowHandler ||
-                action.handler is CodeWhispererPopupLeftArrowHandler
-            )
+        action is CodeWhispererNavigateNextAction || action is CodeWhispererNavigatePrevAction
 
-    private fun isCodeWhispererPopupAction(action: AnAction): Boolean =
-        isCodeWhispererAcceptAction(action) || isCodeWhispererNavigateAction(action)
+    private fun isCodeWhispererForceAction(action: AnAction): Boolean =
+        isCodeWhispererForceAcceptAction(action) || isCodeWhispererNavigateAction(action)
 }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererNavigateNextAction.kt

@@ -0,0 +1,32 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.actions
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.DumbAware
+import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
+import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
+import software.aws.toolkits.resources.message
+
+class CodeWhispererNavigateNextAction : AnAction(message("codewhisperer.inline.navigate.next")), DumbAware {
+    override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.EDT
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabled = e.project != null && e.getData(CommonDataKeys.EDITOR) != null &&
+            CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
+    }
+
+    override fun actionPerformed(e: AnActionEvent) {
+        val sessionContext = e.project?.getUserData(CodeWhispererService.KEY_SESSION_CONTEXT) ?: return
+        if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return
+        ApplicationManager.getApplication().messageBus.syncPublisher(
+            CodeWhispererPopupManager.CODEWHISPERER_USER_ACTION_PERFORMED
+        ).navigateNext(sessionContext)
+    }
+}

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererNavigatePrevAction.kt

@@ -0,0 +1,32 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.actions
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.DumbAware
+import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
+import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
+import software.aws.toolkits.resources.message
+
+class CodeWhispererNavigatePrevAction : AnAction(message("codewhisperer.inline.navigate.previous")), DumbAware {
+    override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.EDT
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabled = e.project != null && e.getData(CommonDataKeys.EDITOR) != null &&
+            CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
+    }
+
+    override fun actionPerformed(e: AnActionEvent) {
+        val sessionContext = e.project?.getUserData(CodeWhispererService.KEY_SESSION_CONTEXT) ?: return
+        if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return
+        ApplicationManager.getApplication().messageBus.syncPublisher(
+            CodeWhispererPopupManager.CODEWHISPERER_USER_ACTION_PERFORMED
+        ).navigatePrevious(sessionContext)
+    }
+}

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/QSwitchToMarketplaceVersionAction.kt

@@ -0,0 +1,94 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.actions
+
+import com.intellij.icons.AllIcons
+import com.intellij.ide.plugins.marketplace.MarketplaceRequests
+import com.intellij.notification.NotificationAction
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.extensions.PluginId
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.progress.ProgressManager
+import com.intellij.openapi.progress.Task
+import com.intellij.openapi.project.DumbAware
+import com.intellij.openapi.updateSettings.impl.PluginDownloader
+import com.intellij.openapi.updateSettings.impl.UpdateSettings
+import software.aws.toolkits.jetbrains.AwsToolkit
+import software.aws.toolkits.jetbrains.core.plugin.PluginUpdateManager
+import software.aws.toolkits.jetbrains.utils.notifyInfo
+import software.aws.toolkits.resources.AwsCoreBundle
+import software.aws.toolkits.resources.message
+
+class QSwitchToMarketplaceVersionAction :
+    AnAction(
+        message("codewhisperer.actions.switch_to_marketplace.title"),
+        null,
+        AllIcons.Actions.Refresh
+    ),
+    DumbAware {
+
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+
+    override fun update(e: AnActionEvent) {
+        e.project?.let {
+            e.presentation.isEnabledAndVisible = PluginUpdateManager.getInstance().isBeta()
+        }
+    }
+
+    override fun actionPerformed(e: AnActionEvent) {
+        UpdateSettings.getInstance().storedPluginHosts.remove(CUSTOM_PLUGIN_URL)
+        UpdateSettings.getInstance().storedPluginHosts.remove("$CUSTOM_PLUGIN_URL/")
+
+        runInEdt {
+            ProgressManager.getInstance().run(object : Task.Backgroundable(
+                null,
+                message("codewhisperer.actions.switch_to_marketplace.progress.title"),
+                true
+            ) {
+                override fun run(indicator: ProgressIndicator) {
+                    installMarketplaceAwsPlugins(PluginId.getId(AwsToolkit.CORE_PLUGIN_ID), indicator)
+                    installMarketplaceAwsPlugins(PluginId.getId(AwsToolkit.Q_PLUGIN_ID), indicator)
+                }
+            })
+        }
+    }
+
+    private fun installMarketplaceAwsPlugins(pluginId: PluginId, indicator: ProgressIndicator) {
+        // force update to marketplace version
+        try {
+            // MarketplaceRequest class is marked as @ApiStatus.Internal
+            val descriptor = MarketplaceRequests.loadLastCompatiblePluginDescriptors(setOf(pluginId))
+                .find { it.pluginId == pluginId } ?: return
+
+            val downloader = PluginDownloader.createDownloader(descriptor)
+            if (!downloader.prepareToInstall(indicator)) return
+            downloader.install()
+
+            if (pluginId == PluginId.getId(AwsToolkit.CORE_PLUGIN_ID)) return
+            notifyInfo(
+                title = AwsCoreBundle.message("aws.notification.auto_update.title", "Amazon Q"),
+                content = AwsCoreBundle.message("aws.settings.auto_update.notification.message"),
+                project = null,
+                notificationActions = listOf(
+                    NotificationAction.createSimpleExpiring(AwsCoreBundle.message("aws.settings.auto_update.notification.yes")) {
+                        ApplicationManager.getApplication().restart()
+                    },
+                    NotificationAction.createSimpleExpiring(AwsCoreBundle.message("aws.settings.auto_update.notification.no")) {
+                    }
+                )
+            )
+        } catch (e: Exception) {
+            return
+        }
+        return
+    }
+
+    companion object {
+        private const val CUSTOM_PLUGIN_URL = "https://d244q0w8umigth.cloudfront.net"
+    }
+}