Merge main into feature/q-mega

aws · Nov 21, 2024 · 758c86f · 758c86f
2 parents 2f03d37 + b01283e
commit 758c86f
Show file tree

Hide file tree

Showing 69 changed files with 1,208 additions and 4,594 deletions.
diff --git a/.changes/next-release/feature-2c399a8b-1bee-48eb-8674-96fac8004d5f.json b/.changes/next-release/feature-2c399a8b-1bee-48eb-8674-96fac8004d5f.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Inline Auto trigger will now happen more consistently and will not conflict with JetBrains code completion."
+}
diff --git a/.changes/next-release/feature-8414d10c-d000-4488-9bc7-3a4616b9c7d5.json b/.changes/next-release/feature-8414d10c-d000-4488-9bc7-3a4616b9c7d5.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "The key shortcuts for Q inline suggestions are now configurable from keymap settings. Default key shortcuts for navigating through suggestions are changed from left/right arrow keys to option(alt) + [ and option(alt) + ], respectively."
+}
diff --git a/.changes/next-release/feature-8be25635-8a25-4526-9f1c-515685fa32b4.json b/.changes/next-release/feature-8be25635-8a25-4526-9f1c-515685fa32b4.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "The Q suggestion inline popup will now hide by default and will show when the user hovers over the suggestion text, the IDE code suggestion popup will also appear to be more transparent to unblock seeing the multi-line suggestions."
+}
diff --git a/...ins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml b/...ins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml
@@ -5,12 +5,8 @@
     <applicationListeners>
         <listener class="software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererUIChangeListener"
                   topic="software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupStateChangeListener"/>
-        <listener class="software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererUIChangeListenerNew"
-                  topic="software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupStateChangeListener"/>
         <listener class="software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceActionListener"
                   topic="software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererUserActionListener"/>
-        <listener class="software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceActionListenerNew"
-                  topic="software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererUserActionListener"/>
     </applicationListeners>
 
     <projectListeners>

diff --git a/...ftware/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererAcceptAction.kt b/...ftware/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererAcceptAction.kt
@@ -10,21 +10,21 @@ 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.CodeWhispererInvocationStatusNew
-import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
+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 &&
-            CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()
+            CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
     }
 
     override fun actionPerformed(e: AnActionEvent) {
-        val sessionContext = e.project?.getUserData(CodeWhispererServiceNew.KEY_SESSION_CONTEXT) ?: return
-        if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) return
+        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)

diff --git a/...ware/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererActionPromoter.kt b/...ware/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererActionPromoter.kt
@@ -7,77 +7,45 @@ 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.amazonq.CodeWhispererFeatureConfigService
-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.CodeWhispererInvocationStatusNew
+import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
 
 class CodeWhispererActionPromoter : ActionPromoter {
     override fun promote(actions: MutableList<out AnAction>, context: DataContext): MutableList<AnAction> {
-        if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
-            val results = actions.toMutableList()
-            if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) return results
-
-            results.sortWith { a, b ->
-                if (isCodeWhispererForceAction(a)) {
-                    return@sortWith -1
-                } else if (isCodeWhispererForceAction(b)) {
-                    return@sortWith 1
-                }
-
-                if (a is ChooseItemAction) {
-                    return@sortWith -1
-                } else if (b is ChooseItemAction) {
-                    return@sortWith 1
-                }
+        val results = actions.toMutableList()
+        if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()) return results
 
-                if (isCodeWhispererAcceptAction(a)) {
-                    return@sortWith -1
-                } else if (isCodeWhispererAcceptAction(b)) {
-                    return@sortWith 1
-                }
+        results.sortWith { a, b ->
+            if (isCodeWhispererForceAction(a)) {
+                return@sortWith -1
+            } else if (isCodeWhispererForceAction(b)) {
+                return@sortWith 1
+            }
 
-                0
+            if (a is ChooseItemAction) {
+                return@sortWith -1
+            } else if (b is ChooseItemAction) {
+                return@sortWith 1
             }
-            return results
-        }
-        val results = actions.toMutableList()
-        results.sortWith { a, b ->
-            if (isCodeWhispererPopupAction(a)) {
+
+            if (isCodeWhispererAcceptAction(a)) {
                 return@sortWith -1
-            } else if (isCodeWhispererPopupAction(b)) {
+            } else if (isCodeWhispererAcceptAction(b)) {
                 return@sortWith 1
-            } else {
-                0
             }
+
+            0
         }
         return results
     }
 
     private fun isCodeWhispererAcceptAction(action: AnAction): Boolean =
-        if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
-            action is CodeWhispererAcceptAction
-        } else {
-            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 =
-        if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
-            action is CodeWhispererNavigateNextAction || action is CodeWhispererNavigatePrevAction
-        } else {
-            action is EditorAction && (
-                action.handler is CodeWhispererPopupRightArrowHandler ||
-                    action.handler is CodeWhispererPopupLeftArrowHandler
-                )
-        }
-
-    private fun isCodeWhispererPopupAction(action: AnAction): Boolean =
-        isCodeWhispererAcceptAction(action) || isCodeWhispererNavigateAction(action)
+        action is CodeWhispererNavigateNextAction || action is CodeWhispererNavigatePrevAction
 
     private fun isCodeWhispererForceAction(action: AnAction): Boolean =
         isCodeWhispererForceAcceptAction(action) || isCodeWhispererNavigateAction(action)

diff --git a/.../aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererNavigateNextAction.kt b/.../aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererNavigateNextAction.kt
@@ -10,8 +10,8 @@ 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.CodeWhispererInvocationStatusNew
-import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
+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 {
@@ -20,12 +20,12 @@ class CodeWhispererNavigateNextAction : AnAction(message("codewhisperer.inline.n
     override fun update(e: AnActionEvent) {
         e.presentation.isEnabled = e.project != null &&
             e.getData(CommonDataKeys.EDITOR) != null &&
-            CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()
+            CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
     }
 
     override fun actionPerformed(e: AnActionEvent) {
-        val sessionContext = e.project?.getUserData(CodeWhispererServiceNew.KEY_SESSION_CONTEXT) ?: return
-        if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) return
+        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)

diff --git a/.../aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererNavigatePrevAction.kt b/.../aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererNavigatePrevAction.kt
@@ -10,8 +10,8 @@ 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.CodeWhispererInvocationStatusNew
-import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
+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 {
@@ -20,12 +20,12 @@ class CodeWhispererNavigatePrevAction : AnAction(message("codewhisperer.inline.n
     override fun update(e: AnActionEvent) {
         e.presentation.isEnabled = e.project != null &&
             e.getData(CommonDataKeys.EDITOR) != null &&
-            CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()
+            CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive()
     }
 
     override fun actionPerformed(e: AnActionEvent) {
-        val sessionContext = e.project?.getUserData(CodeWhispererServiceNew.KEY_SESSION_CONTEXT) ?: return
-        if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) return
+        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)

diff --git a/...ws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererRecommendationAction.kt b/...ws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererRecommendationAction.kt
@@ -10,12 +10,10 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.util.Key
 import kotlinx.coroutines.Job
-import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.LatencyContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.TriggerTypeInfo
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererAutomatedTriggerType
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
-import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererServiceNew
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodewhispererTriggerType
 import java.util.concurrent.atomic.AtomicReference
@@ -32,23 +30,12 @@ class CodeWhispererRecommendationAction : AnAction(message("codewhisperer.trigge
         latencyContext.codewhispererPreprocessingStart = System.nanoTime()
         latencyContext.codewhispererEndToEndStart = System.nanoTime()
         val editor = e.getRequiredData(CommonDataKeys.EDITOR)
-        if (!(
-                if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
-                    CodeWhispererServiceNew.getInstance().canDoInvocation(editor, CodewhispererTriggerType.OnDemand)
-                } else {
-                    CodeWhispererService.getInstance().canDoInvocation(editor, CodewhispererTriggerType.OnDemand)
-                }
-                )
-        ) {
+        if (!CodeWhispererService.getInstance().canDoInvocation(editor, CodewhispererTriggerType.OnDemand)) {
             return
         }
 
         val triggerType = TriggerTypeInfo(CodewhispererTriggerType.OnDemand, CodeWhispererAutomatedTriggerType.Unknown())
-        val job = if (CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()) {
-            CodeWhispererServiceNew.getInstance().showRecommendationsInPopup(editor, triggerType, latencyContext)
-        } else {
-            CodeWhispererService.getInstance().showRecommendationsInPopup(editor, triggerType, latencyContext)
-        }
+        val job = CodeWhispererService.getInstance().showRecommendationsInPopup(editor, triggerType, latencyContext)
 
         e.getData(CommonDataKeys.EDITOR)?.getUserData(ACTION_JOB_KEY)?.set(job)
     }